[TD-4463] enterprise test pass

tests/pytest/alter/alter_keep.py

@@ -22,25 +22,6 @@ class TDTestCase:
         tdLog.debug("start to execute %s" % __file__)
         tdSql.init(conn.cursor(), logSql)
     
-        ##TODO: test keep keep hot alter, cannot be tested for now as test.py's output
-        ##      is inconsistent with the actual output.
-        # tdSql.execute('insert into tb values (now, 10)')
-        # tdSql.execute('insert into tb values (now + 10m, 10)')
-        # tdSql.query('select * from tb')
-        # tdSql.checkRows(2)
-        # tdSql.execute('alter database db keep 40,40,40')
-        # os.system('systemctl restart taosd')
-        # tdSql.execute('insert into tb values (now-60d, 10)')
-        # tdSql.execute('insert into tb values (now-30d, 10)')
-        # tdSql.query('select * from tb')
-        # tdSql.showQueryResult()
-        # tdSql.checkRows(2)
-        # tdSql.execute('alter database db keep 20,20,20')
-        # tdSql.checkRows(3)
-        # os.system('systemctl restart taosd')
-        # tdSql.query('select * from tb')
-        # tdSql.checkRows(2)
-    
     def alterKeepCommunity(self):
         ## community accepts both 1 paramater, 2 parmaters and 3 paramaters
         ## but paramaters other than paramater 1 will be ignored 
@@ -99,6 +80,10 @@ class TDTestCase:
         ## if the order is changed, please modify the following test
         ## to make sure the the test is accurate
 
+        tdSql.execute('alter database db keep 10, 10 ,10')
+        tdSql.query('show databases')
+        tdSql.checkData(0,7,'10,10,10')
+
         tdSql.execute('alter database db keep 100, 98 ,99')
         tdSql.query('show databases')
         tdSql.checkData(0,7,'98,99,100')
@@ -111,15 +96,14 @@ class TDTestCase:
         tdSql.query('show databases')
         tdSql.checkData(0,7,'200,200,200')
 
-        tdSql.execute('alter database db keep 3650,3650,3650')
-        tdSql.error('alter database db keep 4000,3640')
-        tdSql.error('alter database db keep 10,10')
-        tdSql.query('show databases')
-        tdSql.checkData(0,7,'3650,3650,3650')
+        # tdSql.execute('alter database db keep 3650,3650,3650')
+        # tdSql.error('alter database db keep 4000,3640')
+        # tdSql.error('alter database db keep 10,10')
+        # tdSql.query('show databases')
+        # tdSql.checkData(0,7,'3650,3650,3650')
 
     def run(self):
         tdSql.prepare()
-        tdSql.execute('create table tb (ts timestamp, speed int)')
         selfPath = os.path.dirname(os.path.realpath(__file__))
 
         if ("community" in selfPath):
@@ -130,6 +114,29 @@ class TDTestCase:
             self.alterKeepCommunity()
         
 
+        ##TODO: need to wait for TD-4445 to implement the following
+        ##      tests
+        # tdSql.prepare()
+        # tdSql.execute('create table tb (ts timestamp, speed int)')
+        # tdSql.execute('alter database db keep 10,10,10')
+        # tdSql.execute('insert into tb values (now, 10)')
+        # tdSql.execute('insert into tb values (now + 10m, 10)')
+        # tdSql.query('select * from tb')
+        # tdSql.checkRows(2)
+        # tdSql.execute('alter database db keep 40,40,40')
+        # tdSql.query('show databases')
+        # tdSql.checkData(0,7,'40,40,40')
+        # tdSql.error('insert into tb values (now-60d, 10)')
+        # tdSql.execute('insert into tb values (now-30d, 10)')
+        # tdSql.query('select * from tb')
+        # tdSql.checkRows(3)
+        # tdSql.execute('alter database db keep 20,20,20')
+        # tdSql.query('show databases')
+        # tdSql.checkData(0,7,'20,20,20')
+        # tdSql.query('select * from tb')
+        # tdSql.checkRows(2)
+
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)