Merge pull request #7904 from taosdata/test/TD-6633-d

[TD-6633]<test>:modify python file

tests/pytest/tools/taosdemoAllTest/TD-4985/query-limit-offset.json

@@ -22,7 +22,7 @@
             "cache": 50,
             "blocks": 8,
             "precision": "ms",
-            "keep": 365,
+            "keep": 36500,
             "minRows": 100,
             "maxRows": 4096,
             "comp":2,

tests/pytest/tools/taosdemoAllTest/TD-4985/query-limit-offset.py

@@ -13,6 +13,7 @@
 
 import sys
 import os
+import time
 from util.log import *
 from util.cases import *
 from util.sql import *
@@ -24,6 +25,9 @@ class TDTestCase:
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)
 
+        now = time.time()
+        self.ts = int(round(now * 1000))
+
     def getBuildPath(self):
         selfPath = os.path.dirname(os.path.realpath(__file__))
 
@@ -50,6 +54,7 @@ class TDTestCase:
 
         # insert: create one  or mutiple tables per sql and insert multiple rows per sql
         # test case for https://jira.taosdata.com:18080/browse/TD-4985
+        os.system("rm -rf tools/taosdemoAllTest/TD-4985/query-limit-offset.py.sql")
         os.system("%staosdemo -f tools/taosdemoAllTest/TD-4985/query-limit-offset.json -y " % binPath)
         tdSql.execute("use db")
         tdSql.query("select count (tbname) from stb0")
@@ -57,25 +62,25 @@ class TDTestCase:
 
         for i in range(1000):
             tdSql.execute('''insert into stb00_9999 values(%d, %d, %d,'test99.%s')'''
-                            % (1600000000000 + i, i, -10000+i, i))
+                            % (self.ts + i, i, -10000+i, i))
             tdSql.execute('''insert into stb00_8888 values(%d, %d, %d,'test98.%s')'''
-                            % (1600000000000 + i, i, -10000+i, i))
+                            % (self.ts + i, i, -10000+i, i))
             tdSql.execute('''insert into stb00_7777 values(%d, %d, %d,'test97.%s')'''
-                            % (1600000000000 + i, i, -10000+i, i))
+                            % (self.ts + i, i, -10000+i, i))
             tdSql.execute('''insert into stb00_6666 values(%d, %d, %d,'test96.%s')'''
-                            % (1600000000000 + i, i, -10000+i, i))
+                            % (self.ts + i, i, -10000+i, i))
             tdSql.execute('''insert into stb00_5555 values(%d, %d, %d,'test95.%s')'''
-                            % (1600000000000 + i, i, -10000+i, i))
+                            % (self.ts + i, i, -10000+i, i))
             tdSql.execute('''insert into stb00_4444 values(%d, %d, %d,'test94.%s')'''
-                            % (1600000000000 + i, i, -10000+i, i))
+                            % (self.ts + i, i, -10000+i, i))
             tdSql.execute('''insert into stb00_3333 values(%d, %d, %d,'test93.%s')'''
-                            % (1600000000000 + i, i, -10000+i, i))
+                            % (self.ts + i, i, -10000+i, i))
             tdSql.execute('''insert into stb00_2222 values(%d, %d, %d,'test92.%s')'''
-                            % (1600000000000 + i, i, -10000+i, i))
+                            % (self.ts + i, i, -10000+i, i))
             tdSql.execute('''insert into stb00_1111 values(%d, %d, %d,'test91.%s')'''
-                            % (1600000000000 + i, i, -10000+i, i))
+                            % (self.ts + i, i, -10000+i, i))
             tdSql.execute('''insert into stb00_100 values(%d, %d, %d,'test90.%s')'''
-                            % (1600000000000 + i, i, -10000+i, i))
+                            % (self.ts + i, i, -10000+i, i))
         tdSql.query("select * from stb0 where c2 like 'test99%' ")
         tdSql.checkRows(1000)
         tdSql.query("select * from stb0 where  tbname like 'stb00_9999'  limit 10" )
@@ -176,7 +181,7 @@ class TDTestCase:
         tdSql.checkData(0, 1, 5)
         tdSql.checkData(1, 1, 6)
         tdSql.checkData(2, 1, 7)
-        os.system("rm -rf tools/taosdemoAllTest/TD-4985/query-limit-offset.py.sql")
+        
 
     def stop(self):
         tdSql.close()