Merge pull request #7919 from taosdata/test/TD-6635-d

Test/td 6635 d

tests/pytest/import_merge/import_update_0.py

@@ -55,7 +55,7 @@ class TDTestCase:
         tdSql.execute('''drop database if exists test_updata_0 ;''')  
         # update 0 不更新 ; update 1 覆盖更新 ;update 2 合并更新
         tdLog.info("========== test database updata = 0 ==========") 
-        tdSql.execute('''create database test_updata_0 update 0 minrows 10 maxrows 200 ;''')   
+        tdSql.execute('''create database test_updata_0 update 0 minrows 10 maxrows 200 keep 36500;''')   
         tdSql.execute('''use test_updata_0;''')   
         tdSql.execute('''create stable stable_1
                     (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint, 

tests/pytest/import_merge/import_update_1.py

@@ -55,7 +55,7 @@ class TDTestCase:
         tdSql.execute('''drop database if exists test_updata_1 ;''')  
         # update 0 不更新 ; update 1 覆盖更新 ;update 2 合并更新
         tdLog.info("========== test database updata = 1 ==========") 
-        tdSql.execute('''create database test_updata_1 update 1 minrows 10 maxrows 200 ;''')   
+        tdSql.execute('''create database test_updata_1 update 1 minrows 10 maxrows 200 keep 36500;''')   
         tdSql.execute('''use test_updata_1;''')   
         tdSql.execute('''create stable stable_1
                     (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint, 

tests/pytest/import_merge/import_update_2.py

@@ -55,7 +55,7 @@ class TDTestCase:
         tdSql.execute('''drop database if exists test_updata_2 ;''')  
         # update 0 不更新 ; update 1 覆盖更新 ;update 2 合并更新
         tdLog.info("========== test database updata = 2 ==========") 
-        tdSql.execute('''create database test_updata_2 update 2 minrows 10 maxrows 200 ;''')   
+        tdSql.execute('''create database test_updata_2 update 2 minrows 10 maxrows 200 keep 36500;''')   
         tdSql.execute('''use test_updata_2;''')   
         tdSql.execute('''create stable stable_1
                     (ts timestamp , q_int int , q_bigint bigint , q_smallint smallint , q_tinyint tinyint, 

tests/pytest/query/nestquery_last_row.py

@@ -17,6 +17,7 @@ from util.log import tdLog
 from util.cases import tdCases
 from util.sql import tdSql
 import random
+import time
 
 
 class TDTestCase:
@@ -24,7 +25,8 @@ class TDTestCase:
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)
 
-        self.ts = 1600000000000
+        now = time.time()
+        self.ts = int(round(now * 1000))
         self.num = 10
 
     def run(self):

tests/pytest/query/operator_cost.py

@@ -25,7 +25,8 @@ class TDTestCase:
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)
 
-        self.ts = 1600000000000
+        now = time.time()
+        self.ts = int(round(now * 1000))
         self.num = 10
 
     def run(self):

tests/pytest/tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py

@@ -26,7 +26,10 @@ class TDTestCase:
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)
 
-        self.ts = 1538548685000
+        os.system("rm -rf tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py.sql") 
+
+        now = time.time()
+        self.ts = int(round(now * 1000))
         self.num = 100
 
     def get_random_string(self, length):
@@ -691,7 +694,7 @@ class TDTestCase:
         tdSql.query("describe table_40")
         tdSql.checkRows(4096)
 
-        os.system("rm -rf tools/taosdemoAllTest/TD-5213/insert4096columns_not_use_taosdemo.py.sql") 
+        
 
 
     def stop(self):

tests/pytest/tools/taosdemoAllTest/TD-5213/insertSigcolumnsNum4096.json

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