From 991795ca6ec4b09fe15d295a00080e3996ed4c71 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Thu, 24 Nov 2022 13:52:09 +0800
Subject: [PATCH] test: add asan case

---
 tests/parallel_test/cases.task |  4 ++--
 tests/pytest/util/dnodes.py    | 14 ++++++++++----
 tests/system-test/test.py      |  1 +
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 5ba294853f..9c33a07875 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -617,8 +617,8 @@
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/delete_childtable.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/delete_normaltable.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/keep_expired.py
-,,,system-test,python3 ./test.py -f 1-insert/drop.py
-,,,system-test,python3 ./test.py -f 1-insert/drop.py -N 3 -M 3 -i False -n 3
+,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/drop.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 1-insert/drop.py -N 3 -M 3 -i False -n 3
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/join2.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/union1.py
 ,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/concat2.py
diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py
index 22e6127973..ee09130368 100644
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@@ -312,8 +312,14 @@ class TDDnode:
                 cmd = "mintty -h never %s -c %s" % (
                     binPath, self.cfgDir)
             else:
-                cmd = "nohup %s -c %s > /dev/null 2>&1 & " % (
-                    binPath, self.cfgDir)
+                if self.asan:
+                    asanDir = "%s/sim/asan/dnode%d.asan" % (
+                        self.path, self.index)
+                    cmd = "nohup %s -c %s > /dev/null 2> %s & " % (
+                        binPath, self.cfgDir, asanDir)
+                else:
+                    cmd = "nohup %s -c %s > /dev/null 2>&1 & " % (
+                        binPath, self.cfgDir)
         else:
             valgrindCmdline = "valgrind --log-file=\"%s/../log/valgrind.log\"  --tool=memcheck --leak-check=full --show-reachable=no --track-origins=yes --show-leak-kinds=all -v --workaround-gcc296-bugs=yes"%self.cfgDir
 
@@ -748,7 +754,7 @@ class TDDnodes:
             tdLog.exit("index:%d should on a scale of [1, 10]" % (index))
 
     def StopAllSigint(self):
-        tdLog.info("stop all dnodes sigint")
+        tdLog.info("stop all dnodes sigint, asan:%d" % self.asan)
         if self.asan:
             tdLog.info("execute script: %s" % self.stopDnodesSigintPath)
             os.system(self.stopDnodesSigintPath)
@@ -756,7 +762,7 @@ class TDDnodes:
             return
 
     def stopAll(self):
-        tdLog.info("stop all dnodes")
+        tdLog.info("stop all dnodes, asan:%d" % self.asan)
         if self.asan:
             tdLog.info("execute script: %s" % self.stopDnodesPath)
             os.system(self.stopDnodesPath)
diff --git a/tests/system-test/test.py b/tests/system-test/test.py
index cf9aba123c..2017aad1ca 100644
--- a/tests/system-test/test.py
+++ b/tests/system-test/test.py
@@ -464,6 +464,7 @@ if __name__ == "__main__":
             tdDnodes.init(deployPath, masterIp)
             tdDnodes.setTestCluster(testCluster)
             tdDnodes.setValgrind(valgrind)
+            tdDnodes.setAsan(asan)
             tdDnodes.stopAll()
             for dnode in tdDnodes.dnodes:
                 tdDnodes.deploy(dnode.index,{})