From 889872c24de7baa23425ffbab946c352d062c51b Mon Sep 17 00:00:00 2001
From: Ping Xiao <pxiao@taosdata.com>
Date: Wed, 21 Dec 2022 18:43:06 +0800
Subject: [PATCH] test: update script to stop taosadapter service

---
 .../taosbenchmark/auto_create_table_json.py   |  2 ++
 .../taosbenchmark/insert_alltypes_json.py     |  3 ++-
 .../5-taos-tools/taosbenchmark/query_json.py  |  4 ++--
 tests/pytest/util/taosadapter.py              | 15 +++++--------
 tests/system-test/2-query/db.py               | 22 ++++++++++++++++---
 5 files changed, 31 insertions(+), 15 deletions(-)

diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py
index 4e3c9d07ce..a6167158a2 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/auto_create_table_json.py
@@ -153,6 +153,8 @@ class TDTestCase:
         tdSql.query("select count(*) from db.`stb4-2`")
         tdSql.checkData(0, 0, 160)
 
+        tAdapter.stop()
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/insert_alltypes_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/insert_alltypes_json.py
index e63908ce33..54657995e2 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/insert_alltypes_json.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/insert_alltypes_json.py
@@ -320,7 +320,8 @@ class TDTestCase:
         tdSql.checkData(0, 0, 160)
         tdSql.query("select count(*) from db.stb where t13 like 'b1%' or t13 like 'b2%'")
         tdSql.checkData(0, 0, 160)
-
+        
+        tAdapter.stop()
 
     def stop(self):
         tdSql.close()
diff --git a/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py b/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py
index 375113c3ef..c906f61675 100644
--- a/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py
+++ b/tests/develop-test/5-taos-tools/taosbenchmark/query_json.py
@@ -116,11 +116,11 @@ class TDTestCase:
 
         assert times == 1, "result is %s != expect: 1" % times
 
-
+        tAdapter.stop()
 
 
     def stop(self):
-        tdSql.close()
+        tdSql.close()        
         tdLog.success("%s successfully executed" % __file__)
 
 
diff --git a/tests/pytest/util/taosadapter.py b/tests/pytest/util/taosadapter.py
index 440c23dc65..5210825cde 100644
--- a/tests/pytest/util/taosadapter.py
+++ b/tests/pytest/util/taosadapter.py
@@ -227,7 +227,7 @@ class TAdapter:
             time.sleep(0.1)
 
     def stop(self, force_kill=False):
-        signal = "-SIGKILL" if force_kill else "-SIGTERM"
+        signal = "-9" if force_kill else "-15"
 
         if  self.remoteIP:
             self.remote_exec(self.taosadapter_cfg_dict, "tAdapter.running=1\ntAdapter.stop()")
@@ -238,16 +238,13 @@ class TAdapter:
 
         if self.running != 0:
             psCmd = f"ps -ef|grep -w {toBeKilled}| grep -v grep | awk '{{print $2}}'"
-            # psCmd = f"pgrep {toBeKilled}"
-            processID = subprocess.check_output(
-                psCmd, shell=True)
-
-            while(processID):
-                killCmd = f"pkill {signal} {processID} > /dev/null "
+            # psCmd = f"pgrep {toBeKilled}"            
+            processID = subprocess.check_output(psCmd, shell=True).decode("utf-8").strip()
+            while(processID):                
+                killCmd = "kill %s %s > /dev/null 2>&1" % (signal, processID)                
                 os.system(killCmd)
                 time.sleep(1)
-                processID = subprocess.check_output(
-                    psCmd, shell=True).decode("utf-8")
+                processID = subprocess.check_output(psCmd, shell=True).decode("utf-8").strip()                
             if not platform.system().lower() == 'windows':
                 port = 6041
                 fuserCmd = f"fuser -k -n tcp {port} > /dev/null"
diff --git a/tests/system-test/2-query/db.py b/tests/system-test/2-query/db.py
index 7fe8b96157..f6982ccb2a 100644
--- a/tests/system-test/2-query/db.py
+++ b/tests/system-test/2-query/db.py
@@ -42,16 +42,32 @@ class TDTestCase:
 
         tdSql.query("select count(c1) from dbns.ntb interval(1b)")
         tdSql.checkRows(2)
+    
+    def case2(self):
+        tdSql.query("show variables")        
+        tdSql.checkRows(4)
+
+        for i in range(self.replicaVar):
+            tdSql.query("show dnode %d variables like 'debugFlag'" % (i + 1))
+            tdSql.checkRows(1)
+            tdSql.checkData(0, 0, i + 1)
+            tdSql.checkData(0, 1, 'debugFlag')
+            tdSql.checkData(0, 2, 0)
+
+        tdSql.execute("alter dnode 2 'debugFlag 135'")
 
     def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
-        tdSql.prepare()
+        tdSql.prepare(replica = self.replicaVar)
+        
 
         tdLog.printNoPrefix("==========start case1 run ...............")
-
         self.case1()
-
         tdLog.printNoPrefix("==========end case1 run ...............")
 
+        tdLog.printNoPrefix("==========start case2 run ...............")
+        self.case2()
+        tdLog.printNoPrefix("==========end case2 run ...............")
+
     def stop(self):
         tdSql.close()
         tdLog.success(f"{__file__} successfully executed")
-- 
GitLab