From 583c6aa0912820c0ecc0c75a8baaf5355e5d3e39 Mon Sep 17 00:00:00 2001 From: Shuduo Sang Date: Mon, 19 Dec 2022 02:48:13 +0800 Subject: [PATCH] fix: taosbenchmark disorder sample for 2.6 (#18985) * fix: taosbenchmark disorder sample for 2.6 * test: remove deprecated param * fix: update taos-tools a50de3b * fix: taosbenchmark delay time on windows --- src/kit/taos-tools | 2 +- tests/develop-test/5-taos-tools/taosbenchmark/commandline.py | 2 +- .../5-taos-tools/taosbenchmark/invalid_commandline.py | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/kit/taos-tools b/src/kit/taos-tools index ac691425d9..b20c9d1fce 160000 --- a/src/kit/taos-tools +++ b/src/kit/taos-tools @@ -1 +1 @@ -Subproject commit ac691425d9fd1cacd9be7e264271a74e86a17bb3 +Subproject commit b20c9d1fce46bd807549745e321086de9075e904 diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py b/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py index 3f2e2c821b..43daf7e6ad 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py +++ b/tests/develop-test/5-taos-tools/taosbenchmark/commandline.py @@ -55,7 +55,7 @@ class TDTestCase: def run(self): binPath = self.getPath() - cmd = "%s -F 7 -H 9 -n 10 -t 2 -x -y -M -C -d newtest -l 5 -A binary,nchar\(31\) -b tinyint,binary\(23\),bool,nchar -w 29 -E -m $%%^*" %binPath + cmd = "%s -F 7 -n 10 -t 2 -x -y -M -C -d newtest -l 5 -A binary,nchar\(31\) -b tinyint,binary\(23\),bool,nchar -w 29 -E -m $%%^*" %binPath tdLog.info("%s" % cmd) os.system("%s" % cmd) tdSql.execute("use newtest") diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/invalid_commandline.py b/tests/develop-test/5-taos-tools/taosbenchmark/invalid_commandline.py index 3144252707..9ba4f3b21c 100644 --- a/tests/develop-test/5-taos-tools/taosbenchmark/invalid_commandline.py +++ b/tests/develop-test/5-taos-tools/taosbenchmark/invalid_commandline.py @@ -52,7 +52,7 @@ class TDTestCase: def run(self): binPath = self.getPath() - cmd = "%s -F abc -P abc -I abc -T abc -H abc -i abc -S abc -B abc -r abc -t abc -n abc -l abc -w abc -w 16385 -R abc -O abc -a abc -n 2 -t 2 -r 1 -y" %binPath + cmd = "%s -F abc -P abc -I abc -T abc -i abc -S abc -B abc -r abc -t abc -n abc -l abc -w abc -w 16385 -R abc -O abc -a abc -n 2 -t 2 -r 1 -y" %binPath tdLog.info("%s" % cmd) os.system("%s" % cmd) tdSql.query("select count(*) from test.meters") @@ -88,4 +88,4 @@ class TDTestCase: tdCases.addWindows(__file__, TDTestCase()) -tdCases.addLinux(__file__, TDTestCase()) \ No newline at end of file +tdCases.addLinux(__file__, TDTestCase()) -- GitLab