From f8d29a12abc223f0a3b963725d44a6147919813a Mon Sep 17 00:00:00 2001
From: plum-lihui <huili@taosdata.com>
Date: Tue, 31 May 2022 16:46:01 +0800
Subject: [PATCH] test: support taosc run by valgrind to python cases

---
 tests/pytest/util/dnodes.py | 38 +++++++++++++++++++++----------------
 tests/system-test/test.py   | 10 ++++++++--
 2 files changed, 30 insertions(+), 18 deletions(-)

diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py
index b8cb73cb44..2e11b93e5f 100644
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@@ -494,6 +494,7 @@ class TDDnodes:
         self.simDeployed = False
         self.testCluster = False
         self.valgrind = 0
+        self.killValgrind = 1
 
     def init(self, path, remoteIP = ""):
         psCmd = "ps -ef|grep -w taosd| grep -v grep| grep -v defunct | awk '{print $2}'"
@@ -505,14 +506,15 @@ class TDDnodes:
             processID = subprocess.check_output(
                 psCmd, shell=True).decode("utf-8")
 
-        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
-        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
-        while(processID):
-            killCmd = "kill -9 %s > /dev/null 2>&1" % processID
-            os.system(killCmd)
-            time.sleep(1)
-            processID = subprocess.check_output(
-                psCmd, shell=True).decode("utf-8")
+        if self.killValgrind == 1:
+            psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+            processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+            while(processID):
+                killCmd = "kill -9 %s > /dev/null 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8")
 
         binPath = self.dnodes[0].getPath() + "/../../../"
         # tdLog.debug("binPath %s" % (binPath))
@@ -549,6 +551,9 @@ class TDDnodes:
     def setValgrind(self, value):
         self.valgrind = value
 
+    def setKillValgrind(self, value):
+        self.killValgrind = value
+
     def deploy(self, index, *updatecfgDict):
         self.sim.setTestCluster(self.testCluster)
 
@@ -622,14 +627,15 @@ class TDDnodes:
             processID = subprocess.check_output(
                 psCmd, shell=True).decode("utf-8")
 
-        psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
-        processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
-        while(processID):
-            killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
-            os.system(killCmd)
-            time.sleep(1)
-            processID = subprocess.check_output(
-                psCmd, shell=True).decode("utf-8")
+        if self.killValgrind == 1:
+            psCmd = "ps -ef|grep -w valgrind.bin| grep -v grep | awk '{print $2}'"
+            processID = subprocess.check_output(psCmd, shell=True).decode("utf-8")
+            while(processID):
+                killCmd = "kill -TERM %s > /dev/null 2>&1" % processID
+                os.system(killCmd)
+                time.sleep(1)
+                processID = subprocess.check_output(
+                    psCmd, shell=True).decode("utf-8")
 
         # if os.system(cmd) != 0 :
         # tdLog.exit(cmd)
diff --git a/tests/system-test/test.py b/tests/system-test/test.py
index 6b6487918c..a11085708c 100644
--- a/tests/system-test/test.py
+++ b/tests/system-test/test.py
@@ -37,6 +37,7 @@ if __name__ == "__main__":
     masterIp = ""
     testCluster = False
     valgrind = 0
+    killValgrind = 1
     logSql = True
     stop = 0
     restart = False
@@ -45,8 +46,8 @@ if __name__ == "__main__":
         windows = 1
     updateCfgDict = {}
     execCmd = ""
-    opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:e:', [
-        'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help', 'restart', 'updateCfgDict', 'execCmd'])
+    opts, args = getopt.gnu_getopt(sys.argv[1:], 'f:p:m:l:scghrd:k:e:', [
+        'file=', 'path=', 'master', 'logSql', 'stop', 'cluster', 'valgrind', 'help', 'restart', 'updateCfgDict', 'killv', 'execCmd'])
     for key, value in opts:
         if key in ['-h', '--help']:
             tdLog.printNoPrefix(
@@ -60,6 +61,7 @@ if __name__ == "__main__":
             tdLog.printNoPrefix('-g valgrind Test Flag')
             tdLog.printNoPrefix('-r taosd restart test')
             tdLog.printNoPrefix('-d update cfg dict, base64 json str')
+            tdLog.printNoPrefix('-k not kill valgrind processer')
             tdLog.printNoPrefix('-e eval str to run')
             sys.exit(0)
 
@@ -100,6 +102,9 @@ if __name__ == "__main__":
                 print('updateCfgDict convert fail.')
                 sys.exit(0)
 
+        if key in ['-k', '--killValgrind']:
+            killValgrind = 0
+
         if key in ['-e', '--execCmd']:
             try:
                 execCmd = base64.b64decode(value.encode()).decode()
@@ -189,6 +194,7 @@ if __name__ == "__main__":
         else:
             tdCases.runAllWindows(conn)
     else:
+        tdDnodes.setKillValgrind(killValgrind)
         tdDnodes.init(deployPath, masterIp)
         tdDnodes.setTestCluster(testCluster)
         tdDnodes.setValgrind(valgrind)
-- 
GitLab