From 6de5bfcbe074aa5cdd50a4b2d983beb05c08bb1b Mon Sep 17 00:00:00 2001
From: tomchon <haoran920c@163.com>
Date: Mon, 31 May 2021 04:36:39 +0800
Subject: [PATCH] temp1

---
 .../tools/taosdemoAllTest/subSyncKeepStart.json    | 14 ++++++++------
 .../taosdemoAllTest/taosdemoTestSubWithJson.py     |  5 +++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/tests/pytest/tools/taosdemoAllTest/subSyncKeepStart.json b/tests/pytest/tools/taosdemoAllTest/subSyncKeepStart.json
index 5bc6be99f0..4759d6cfe0 100644
--- a/tests/pytest/tools/taosdemoAllTest/subSyncKeepStart.json
+++ b/tests/pytest/tools/taosdemoAllTest/subSyncKeepStart.json
@@ -11,10 +11,11 @@
       {
        "concurrent":2, 
        "mode":"sync", 
-       "interval":0, 
-       "keepProgress":"no",
-       "restart":"yes",
-       "resubAfterConsume":1,
+       "interval":10000, 
+       "resubAfterConsume":-1,
+       "endAfterConsume":0,
+       "keepProgress":"yes",
+       "restart":"no",
        "sqls": [
         {
           "sql": "select * from stb00_0", 
@@ -26,10 +27,11 @@
        "stblname": "stb0",
        "threads":2, 
        "mode":"sync", 
-       "interval":1000, 
+       "interval":0, 
+       "resubAfterConsume":1,
+       "endAfterConsume":-1,
        "keepProgress":"yes",
        "restart":"no",
-       "resubAfterConsume":1,
        "sqls": [
         {
           "sql": "select * from xxxx where ts >= '2021-02-25 10:00:01.000' ", 
diff --git a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py
index 16477da8a3..b7bda14768 100644
--- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py
+++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py
@@ -112,11 +112,12 @@ class TDTestCase:
         # os.system("rm -rf ./all_subscribe*")
   
         # sql number lager  100
+        os.system("rm -rf  /var/lib/taos/subscribe/")
         os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath)
         # assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSpecMaxsql100.json" % binPath) != 0
         # assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSuperMaxsql100.json" % binPath) != 0
         os.system("%staosdemo -f tools/taosdemoAllTest/subSyncKeepStart.json" % binPath)
-        # tdSql.execute("insert into db.stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218413000,'R','bf3',8637,98.861045)") 
+        # tdSql.execute("insert into db.stb00_0 values(1614218412000,'R','bf3',8637,78.861045)(1614218413000,'R','bf3',8637,98.861045)") 
 
 
         # # # merge result files
@@ -149,7 +150,7 @@ class TDTestCase:
         # delete useless files
         os.system("rm -rf ./insert_res.txt")
         os.system("rm -rf tools/taosdemoAllTest/*.py.sql")        
-        os.system("rm -rf ./subscribe_res*")   
+        # os.system("rm -rf ./subscribe_res*")   
         os.system("rm -rf ./all_subscribe*")
          
     def stop(self):
-- 
GitLab