xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

adjust file general/insert/basic1.sim

This commit is contained in:
Shengliang Guan 2021-12-18 00:26:08 +08:00
parent 4279d6a44d
commit 8a82da8f6d
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
source/dnode/mgmt/daemon/src/daemon.c
View File

@ -92,6 +92,7 @@ void dmnPrintVersion() {
} }
int dmnReadConfig(const char *path) { int dmnReadConfig(const char *path) {
tstrncpy(configDir, global.configDir, PATH_MAX);
taosInitGlobalCfg(); taosInitGlobalCfg();
taosReadGlobalLogCfg(); taosReadGlobalLogCfg();

10
tests/script/general/user/basic1.sim
View File

@ -5,7 +5,7 @@ sql connect
print =============== show users print =============== show users
sql show users sql show users
if $rows != 3 then if $rows != 1 then
return -1 return -1
endi endi
@ -21,7 +21,7 @@ sql_error drop account root
print =============== create user1 print =============== create user1
sql create user user1 PASS 'user1' sql create user user1 PASS 'user1'
sql show users sql show users
if $rows != 4 then if $rows != 2 then
return -1 return -1
endi endi
@ -33,7 +33,7 @@ print $data30 $data31 $data32
print =============== create user2 print =============== create user2
sql create user user2 PASS 'user2' sql create user user2 PASS 'user2'
sql show users sql show users
if $rows != 5 then if $rows != 3 then
return -1 return -1
endi endi
@ -46,7 +46,7 @@ print $data40 $data41 $data42
print =============== drop user1 print =============== drop user1
sql drop user user1 sql drop user user1
sql show users sql show users
if $rows != 4 then if $rows != 2 then
return -1 return -1
endi endi
@ -62,7 +62,7 @@ system sh/exec.sh -n dnode1 -s start
print =============== show users print =============== show users
sql show users sql show users
if $rows != 4 then if $rows != 2 then
return -1 return -1
endi endi

2
tests/script/sh/exec.sh
View File

@ -9,7 +9,7 @@
# fi # fi
set +e set +e
set -x #set -x
UNAME_BIN=`which uname` UNAME_BIN=`which uname`
OS_TYPE=`$UNAME_BIN` OS_TYPE=`$UNAME_BIN`

1
tests/script/test.sh
View File

@ -126,7 +126,6 @@ if [ -n "$FILE_NAME" ]; then
else else
echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f $FILE_NAME echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f $FILE_NAME
$PROGRAM -c $CFG_DIR -f $FILE_NAME $PROGRAM -c $CFG_DIR -f $FILE_NAME
# valgrind --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes --log-file=${CODE_DIR}/../script/valgrind.log $PROGRAM -c $CFG_DIR -f $FILE_NAME
fi fi
else else
echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f basicSuite.sim echo "ExcuteCmd:" $PROGRAM -c $CFG_DIR -f basicSuite.sim