From 0a45ee6812f3d93f1442d651e4bb23b98df83b96 Mon Sep 17 00:00:00 2001
From: liuyq-617 <yqliu@taosdata.com>
Date: Tue, 10 Aug 2021 14:30:37 +0800
Subject: [PATCH] [TD-4967]<test>update retention policy testcase

---
 tests/pytest/insert/retentionpolicy.py | 26 +++++++++++++++++++-------
 1 file changed, 19 insertions(+), 7 deletions(-)

diff --git a/tests/pytest/insert/retentionpolicy.py b/tests/pytest/insert/retentionpolicy.py
index e0446113d6..067fe3e5c3 100644
--- a/tests/pytest/insert/retentionpolicy.py
+++ b/tests/pytest/insert/retentionpolicy.py
@@ -71,13 +71,10 @@ class TDTestRetetion:
         tdDnodes.start(1)
         
         tdLog.info(cmd)
+        ttime = datetime.datetime.now()
         tdSql.execute(cmd)
         self.queryRows=tdSql.query('select * from test')
-        if self.queryRows==4:
-            self.checkRows(4,cmd)
-            return 0
-        else:
-            self.checkRows(5,cmd)
+        self.checkRows(3,cmd)
         tdLog.info("=============== step3")
         tdDnodes.stop(1)
         os.system("date -s '%s'"%(datetime.datetime.now()+datetime.timedelta(hours=48)))
@@ -92,7 +89,7 @@ class TDTestRetetion:
         tdLog.info(cmd)
         tdSql.execute(cmd)
         self.queryRows=tdSql.query('select * from test')
-        self.checkRows(6,cmd)
+        self.checkRows(3,cmd)
         tdLog.info("=============== step4")
         tdDnodes.stop(1)
         tdDnodes.start(1)
@@ -100,7 +97,7 @@ class TDTestRetetion:
         tdLog.info(cmd)
         tdSql.execute(cmd)
         self.queryRows=tdSql.query('select * from test')
-        self.checkRows(5,cmd)
+        self.checkRows(4,cmd)
 
         tdLog.info("=============== step5")
         tdDnodes.stop(1)
@@ -109,6 +106,21 @@ class TDTestRetetion:
         self.queryRows=tdSql.query('select * from test where ts > now-1d')
         self.checkRows(2,cmd)
 
+        tdLog.info("=============== step6")
+        tdDnodes.stop(1)
+        os.system("date -s '%s'"%(ttime + datetime.timedelta(seconds=(72*60*60-7))))
+        tdDnodes.start(1)
+        while datetime.datetime.now() < (ttime + datetime.timedelta(seconds=(72*60*60-1))):
+            time.sleep(0.001)
+        cmd = 'select * from test'
+        self.queryRows=tdSql.query(cmd)
+        self.checkRows(4,cmd)
+        while datetime.datetime.now() < (ttime + datetime.timedelta(hours=72)):
+            time.sleep(0.001)
+        cmd = 'select * from test'
+        self.queryRows=tdSql.query(cmd)
+        self.checkRows(3,cmd)
+
     def stop(self):
         os.system("sudo timedatectl set-ntp true")
         os.system("date -s '%s'"%(datetime.datetime.now()+datetime.timedelta(hours=1)))
-- 
GitLab