From cbf279470df807390b7633eed2e96e85d6dff449 Mon Sep 17 00:00:00 2001 From: Alex Duan <417921451@qq.com> Date: Sun, 23 Feb 2025 16:13:33 +0800 Subject: [PATCH] fix: use db change output with printf --- tests/army/cmdline/taosCli.py | 5 +++-- tests/army/tools/taosdump/native/taosdumpCommandline.py | 3 +++ tools/shell/src/shellEngine.c | 3 +-- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/tests/army/cmdline/taosCli.py b/tests/army/cmdline/taosCli.py index d3ac5c0d7b..e1d1933b3f 100644 --- a/tests/army/cmdline/taosCli.py +++ b/tests/army/cmdline/taosCli.py @@ -108,7 +108,7 @@ class TDTestCase(TBase): self.taos(f'{mode} -s "select * from {db}.d0; >>d0.csv" ') # use db - rlist = self.taos(f'{mode} -s "show databases;use {db};use {db};use {db};quit;" ') + rlist = self.taos(f'{mode} -s "use {db};" ') self.checkListString(rlist, "Database changed") # update sql rlist = self.taos(f'{mode} -s "alter local \'resetlog\';" ') @@ -201,7 +201,8 @@ class TDTestCase(TBase): ['-B -s "show dnodes;"', queryOK], ['-s "help;"', "Timestamp expression Format"], ['-s ""', "Invalid commands"], - ['-t', "2: service ok"] + ['-t', "2: service ok"], + ['-uroot -p < cmdline/data/pwd.txt -s "show dnodes;"', queryOK], ] for arg in args: diff --git a/tests/army/tools/taosdump/native/taosdumpCommandline.py b/tests/army/tools/taosdump/native/taosdumpCommandline.py index 0e7c3dd29f..2779ad57d2 100644 --- a/tests/army/tools/taosdump/native/taosdumpCommandline.py +++ b/tests/army/tools/taosdump/native/taosdumpCommandline.py @@ -178,6 +178,9 @@ class TDTestCase(TBase): self.checkExcept(taosdump + " -A -o ") self.checkExcept(taosdump + " -A -o ./noexistpath/") self.checkExcept(taosdump + f" -d invalidAVRO -o {tmpdir}") + self.checkExcept(taosdump + f" -P invalidport") + self.checkExcept(taosdump + f" -D") + self.checkExcept(taosdump + f" -P 65536") # run def run(self): diff --git a/tools/shell/src/shellEngine.c b/tools/shell/src/shellEngine.c index ebec4ca06c..a3e542a768 100644 --- a/tools/shell/src/shellEngine.c +++ b/tools/shell/src/shellEngine.c @@ -254,8 +254,7 @@ void shellRunSingleCommandImp(char *command) { } if (shellRegexMatch(command, "^\\s*use\\s+[a-zA-Z0-9_]+\\s*;\\s*$", REG_EXTENDED | REG_ICASE)) { - fprintf(stdout, "Database changed.\r\n\r\n"); - fflush(stdout); + printf("Database changed.\r\n\r\n"); // call back auto tab module callbackAutoTab(command, pSql, true);