revert test cases

tests/pytest/client/client.py

@@ -71,7 +71,7 @@ class TDTestCase:
         time.sleep(3)
 
         ret = tdSql.query('show vnodes "{}"'.format(dnodeEndpoint))
-        tdSql.checkRows(2)
+        tdSql.checkRows(1)
         tdSql.checkData(0, 0, 2)
         tdSql.checkData(0, 1, "leader")
 

tests/pytest/query/queryError.py

@@ -70,7 +70,6 @@ class TDTestCase:
         tdSql.error("select * from dev_001 where \"name\" = 'first'")
 
         # TS-1577
-        time.sleep(1)
         tdSql.query("show databases")
         rows = tdSql.queryRows
 

tests/pytest/table/column_num.py

@@ -108,8 +108,8 @@ class TDTestCase:
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
 # convert end

tests/pytest/tag_lite/3.py

@@ -1312,12 +1312,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/4.py

@@ -1855,13 +1855,12 @@ class TDTestCase:
         # TSIM: sql drop database $db
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
-        time.sleep(1)
         # TSIM: sql show databases
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/5.py

@@ -2283,13 +2283,12 @@ class TDTestCase:
         # TSIM: sql drop database $db
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
-        time.sleep(1)
         # TSIM: sql show databases
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/6.py

@@ -2732,12 +2732,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/add.py

@@ -2056,12 +2056,11 @@ class TDTestCase:
         tdLog.info('sql drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/bigint.py

@@ -562,12 +562,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/binary.py

@@ -566,12 +566,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/binary_binary.py

@@ -777,12 +777,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/bool.py

@@ -561,12 +561,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/bool_binary.py

@@ -771,12 +771,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/bool_int.py

@@ -803,12 +803,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/change.py

@@ -925,12 +925,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/column.py

@@ -177,12 +177,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/commit.py

@@ -2301,12 +2301,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/delete.py

@@ -1698,12 +1698,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/double.py

@@ -562,12 +562,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/filter.py

@@ -352,12 +352,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/float.py

@@ -562,12 +562,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/int.py

@@ -561,12 +561,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/int_binary.py

@@ -769,12 +769,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/int_float.py

@@ -805,12 +805,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/set.py

@@ -876,12 +876,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/smallint.py

@@ -562,12 +562,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/tinyint.py

@@ -562,12 +562,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/unsignedBigint.py

@@ -562,12 +562,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/unsignedInt.py

@@ -563,12 +563,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/unsignedSmallint.py

@@ -562,12 +562,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tag_lite/unsignedTinyint.py

@@ -562,12 +562,11 @@ class TDTestCase:
         tdLog.info('drop database db')
         tdSql.execute('drop database db')
         # TSIM: sql show databases
-        time.sleep(1)
         tdLog.info('show databases')
         tdSql.query('show databases')
         # TSIM: if $rows != 0 then
-        tdLog.info('tdSql.checkRow(1)')
-        tdSql.checkRows(1)
+        tdLog.info('tdSql.checkRow(0)')
+        tdSql.checkRows(0)
         # TSIM: return -1
         # TSIM: endi
         # TSIM:

tests/pytest/tools/taosdumpTest.py

@@ -101,9 +101,8 @@ class TDTestCase:
 
         tdSql.execute("drop database db")
         tdSql.execute("drop database db1")
-        time.sleep(1)
         tdSql.query("show databases")
-        tdSql.checkRows(1)
+        tdSql.checkRows(0)
 
         os.system("%s -i ./taosdumptest/tmp1" % binPath)
         os.system("%s -i ./taosdumptest/tmp2" % binPath)

tests/pytest/tools/taosdumpTest2.py

@@ -94,9 +94,8 @@ class TDTestCase:
             binPath)
 
         tdSql.execute("drop database db")
-        time.sleep(1)
         tdSql.query("show databases")
-        tdSql.checkRows(1)
+        tdSql.checkRows(0)
 
         os.system("%s -i ./taosdumptest/tmp -y" % binPath)