diff --git a/tests/pytest/tools/taosdumpTest.py b/tests/pytest/tools/taosdumpTest.py index 95ed69b9177a079a59002d87d4e6bccbd9f6dc9a..1835054be4799396bd4ed700276d521081ef1af0 100644 --- a/tests/pytest/tools/taosdumpTest.py +++ b/tests/pytest/tools/taosdumpTest.py @@ -94,9 +94,9 @@ class TDTestCase: else: tdLog.info("taosdump found: %s" % binPath) - os.system("%s -y --databases db -o ./taosdumptest/tmp1" % binPath) + os.system("%s --databases db -o ./taosdumptest/tmp1" % binPath) os.system( - "%s -y --databases db1 -o ./taosdumptest/tmp2" % + "%s --databases db1 -o ./taosdumptest/tmp2" % binPath) tdSql.execute("drop database db") @@ -177,7 +177,7 @@ class TDTestCase: tdSql.query("show stables") tdSql.checkRows(2) os.system( - "%s -y --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" % + "%s --databases db12312313231231321312312312_323 -o ./taosdumptest/tmp1" % binPath) tdSql.execute("drop database db12312313231231321312312312_323") os.system("%s -i ./taosdumptest/tmp1" % binPath) diff --git a/tests/pytest/tools/taosdumpTest2.py b/tests/pytest/tools/taosdumpTest2.py index 439e402c61d49778f235a3105b07a34e50e2d0a5..66ba8b9e1d57653456ca8a40589aaa459f6f5c22 100644 --- a/tests/pytest/tools/taosdumpTest2.py +++ b/tests/pytest/tools/taosdumpTest2.py @@ -97,7 +97,7 @@ class TDTestCase: tdSql.query("show databases") tdSql.checkRows(0) - os.system("%s -i ./taosdumptest/tmp -y" % binPath) + os.system("%s -i ./taosdumptest/tmp " % binPath) tdSql.query("show databases") tdSql.checkRows(1) @@ -125,13 +125,13 @@ class TDTestCase: os.system("rm ./taosdumptest/tmp/*.sql") os.system("rm ./taosdumptest/tmp/*.avro*") os.system("rm -rf ./taosdumptest/tmp/taosdump.*") - os.system("%s -D test -o ./taosdumptest/tmp -y" % binPath) + os.system("%s -D test -o ./taosdumptest/tmp " % binPath) tdSql.execute("drop database test") tdSql.query("show databases") tdSql.checkRows(1) - os.system("%s -i ./taosdumptest/tmp -y" % binPath) + os.system("%s -i ./taosdumptest/tmp " % binPath) tdSql.execute("use test") tdSql.error("show vnodes '' ") diff --git a/tests/pytest/tools/taosdumpTestNanoSupport.py b/tests/pytest/tools/taosdumpTestNanoSupport.py index 7d614543e124519636199d81b1555944272d2def..abfee1f5053a4cca16a656114829c31d87bfbe5a 100644 --- a/tests/pytest/tools/taosdumpTestNanoSupport.py +++ b/tests/pytest/tools/taosdumpTestNanoSupport.py @@ -134,15 +134,15 @@ class TDTestCase: # dump all data os.system( - "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" % + "%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath) # dump part data with -S -E os.system( - '%s -y -g --databases timedb1 -S 1625068810000000000 -E 1625068860000000000 -o ./taosdumptest/dumptmp2 ' % + '%s -g --databases timedb1 -S 1625068810000000000 -E 1625068860000000000 -o ./taosdumptest/dumptmp2 ' % binPath) os.system( - '%s -y -g --databases timedb1 -S 1625068810000000000 -o ./taosdumptest/dumptmp3 ' % + '%s -g --databases timedb1 -S 1625068810000000000 -o ./taosdumptest/dumptmp3 ' % binPath) tdSql.execute("drop database timedb1") @@ -200,14 +200,14 @@ class TDTestCase: self.createdb(precision="us") os.system( - "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" % + "%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath) os.system( - '%s -y -g --databases timedb1 -S 1625068810000000 -E 1625068860000000 -o ./taosdumptest/dumptmp2 ' % + '%s -g --databases timedb1 -S 1625068810000000 -E 1625068860000000 -o ./taosdumptest/dumptmp2 ' % binPath) os.system( - '%s -y -g --databases timedb1 -S 1625068810000000 -o ./taosdumptest/dumptmp3 ' % + '%s -g --databases timedb1 -S 1625068810000000 -o ./taosdumptest/dumptmp3 ' % binPath) os.system("%s -i ./taosdumptest/dumptmp1" % binPath) @@ -269,14 +269,14 @@ class TDTestCase: self.createdb(precision="ms") os.system( - "%s -y -g --databases timedb1 -o ./taosdumptest/dumptmp1" % + "%s -g --databases timedb1 -o ./taosdumptest/dumptmp1" % binPath) os.system( - '%s -y -g --databases timedb1 -S 1625068810000 -E 1625068860000 -o ./taosdumptest/dumptmp2 ' % + '%s -g --databases timedb1 -S 1625068810000 -E 1625068860000 -o ./taosdumptest/dumptmp2 ' % binPath) os.system( - '%s -y -g --databases timedb1 -S 1625068810000 -o ./taosdumptest/dumptmp3 ' % + '%s -g --databases timedb1 -S 1625068810000 -o ./taosdumptest/dumptmp3 ' % binPath) os.system("%s -i ./taosdumptest/dumptmp1" % binPath) diff --git a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJson-illegalData.py b/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJson-illegalData.py index b7b6261abcd03954156745dfaa346a75ad4853be..47567c76a15e25ae8fca160cc8dd72aaaa0d3c8e 100644 --- a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJson-illegalData.py +++ b/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJson-illegalData.py @@ -124,9 +124,9 @@ class TDTestCase: os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/insertMaxNumPerReq.json -y " % binPath) tdSql.execute("use db") tdSql.query("select count(*) from stb0") - tdSql.checkRows(0) + tdSql.checkData(0, 0, 5000000) tdSql.query("select count(*) from stb1") - tdSql.checkRows(0) + tdSql.checkData(0, 0, 5000000) diff --git a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml-illegalData.py b/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml-illegalData.py index 218a61aa80bb2f0638dce2be183cdade64f5f30f..aac0d1fa378498fdf2afddc729fe2555afcb5539 100644 --- a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml-illegalData.py +++ b/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml-illegalData.py @@ -94,7 +94,8 @@ class TDTestCase: tdSql.execute("drop database if exists db1") tdSql.execute("drop database if exists db") os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insertNumOfrecordPerReq0-sml.json -y " % binPath) - tdSql.error("select count(*) from db.stb0") + tdSql.query("select count(*) from db.stb0") + tdSql.checkData(0, 0, 1) # # has a core dumped # tdSql.execute("drop database if exists db") # os.system("%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insertNumOfrecordPerReqless0-sml.json -y " % binPath) diff --git a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml.py b/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml.py index e5da94a20ee97a6da6db6e63e632f4da14680178..f063f39bd29d980515aad2a22440d281be83e1dc 100644 --- a/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml.py +++ b/tests/system-test/5-taos-tools/taosbenchmark/taosdemoTestInsertWithJsonSml.py @@ -116,9 +116,9 @@ class TDTestCase: tdSql.query("select count (tbname) from stb1") tdSql.checkData(0, 0, 6) tdSql.query("select count (tbname) from stb2") - tdSql.checkData(0, 0, 4) + tdSql.checkData(0, 0, 7) tdSql.query("select count (tbname) from stb3") - tdSql.checkData(0, 0, 2) + tdSql.checkData(0, 0, 8) os.system( "%staosBenchmark -f 5-taos-tools/taosbenchmark/sml/insert-renewdb-sml.json -y" % binPath @@ -129,9 +129,9 @@ class TDTestCase: tdSql.query("select count(*) from stb1") tdSql.checkData(0, 0, 120) tdSql.query("select count(*) from stb2") - tdSql.checkData(0, 0, 80) + tdSql.checkData(0, 0, 140) tdSql.query("select count(*) from stb3") - tdSql.checkData(0, 0, 40) + tdSql.checkData(0, 0, 160) tdSql.query("select count(*) from stb4") tdSql.checkData(0, 0, 160)