Merge pull request #34626 from taosdata/enh/some-unit-test

enh(tests): add unit test cases to concurrent group

Author: feici02

test/cases/81-Tools/03-Benchmark/test_benchmark_except.py

@@ -28,7 +28,7 @@ def setup_class(cls):
         cls._rlist = None
 
     #
-    # ------------------- test_insert_cancel.py ----------------
+    # ------------------- common helpers ----------------
     #
     def get_pids_by_name(self, process_name):
         pids = []
@@ -37,94 +37,117 @@ def get_pids_by_name(self, process_name):
                 pids.append(proc.pid)
         return pids
 
+    def wait_for_benchmark(self, timeout=30, interval=0.5):
+        """Poll until taosBenchmark process appears, return pids."""
+        elapsed = 0
+        while elapsed < timeout:
+            pids = self.get_pids_by_name("taosBenchmark")
+            if pids:
+                tdLog.info(f"Found taosBenchmark with PID: {pids}")
+                return pids
+            time.sleep(interval)
+            elapsed += interval
+        tdLog.exit("Timeout waiting for taosBenchmark process to start.")
+        return []
+
+    #
+    # ------------------- test_insert_cancel ----------------
+    #
     def stopThread(self, isForceExit):
-        tdLog.info("dnodeNodeStopThread start")
-        time.sleep(10)
-        pids = self.get_pids_by_name("taosBenchmark")
-        if pids:
-            tdLog.info(f"Find a process named taosBbenchmark with PID: {pids}")
-        else:
-            tdLog.exit("No process named taosBbenchmark was found.")
+        tdLog.info(f"stopThread start, force={isForceExit}")
+        pids = self.wait_for_benchmark()
+        if not pids:
+            tdLog.exit("No process named taosBenchmark was found.")
+
+        # Wait for benchmark to enter active insert phase
+        time.sleep(3)
 
         os.kill(pids[0], signal.SIGINT)
         if isForceExit:
+            # Send second SIGINT immediately (no delay!) to trigger forced exit
             os.kill(pids[0], signal.SIGINT)
 
+        # Wait for benchmark to finish and write output
         time.sleep(10)
-        
+
         if self._rlist:
             tdLog.info(self._rlist)
             if isForceExit:
                 self.checkListString(self._rlist, "Benchmark process forced exit!")
-            else:    
+            else:
                 self.checkListString(self._rlist, "Receive SIGINT or other signal, quit benchmark")
         else:
             tdLog.exit("The benchmark process has not stopped!")
 
-
-    def dbInsertThread(self):
-        tdLog.info(f"dbInsertThread start")
-        # taosBenchmark run
-        cmd = "-d db -t 10000 -n 10000 -T 8 -I stmt -y"
+    def dbInsertThread(self, cmd):
+        tdLog.info(f"dbInsertThread start, cmd: {cmd}")
         self._rlist = self.benchmark(cmd, checkRun=False)
 
     # run
     def do_insert_cancel(self):
-        tdLog.info(f"start to excute {__file__}")
-        t1 = threading.Thread(target=self.dbInsertThread)
+        tdLog.info(f"start to execute {__file__} - insert cancel")
+
+        # Use enough tables so benchmark is still running when SIGINT arrives
+        cmd = "-d db -t 10000 -n 10000 -T 8 -I stmt -y"
+
+        # Test 1: graceful cancel (single SIGINT)
+        self._rlist = None
+        t1 = threading.Thread(target=self.dbInsertThread, args=(cmd,))
         t2 = threading.Thread(target=self.stopThread, args=(False,))
         t1.start()
         t2.start()
-
         t1.join()
         t2.join()
 
-        t1 = threading.Thread(target=self.dbInsertThread)
+        # Test 2: forced exit (double SIGINT)
+        self._rlist = None
+        t1 = threading.Thread(target=self.dbInsertThread, args=(cmd,))
         t2 = threading.Thread(target=self.stopThread, args=(True,))
         t1.start()
         t2.start()
-
         t1.join()
         t2.join()
 
-        print("do insert canceled .................... [passed]")
+        tdLog.info("do insert canceled .................... [passed]")
 
     #
-    # ------------------- test_insert_error_exit.py ----------------
+    # ------------------- test_insert_error_exit ----------------
     #
     def dnodeNodeStopThread(self):
         tdLog.info("dnodeNodeStopThread start")
+        pids = self.wait_for_benchmark()
+        if not pids:
+            tdLog.exit("No process named taosBenchmark was found.")
+
+        # Wait for benchmark to enter active insert phase
+        time.sleep(3)
+        tdLog.info("stopping dnode 1 ...")
+        sc.dnodeStop(1)
+
+        # Wait for benchmark to detect error and exit
         time.sleep(10)
-        sc.dnodeStop(2)
-        time.sleep(10)
+
         if self._rlist:
             tdLog.info(self._rlist)
             self.checkListString(self._rlist, "failed to execute insert statement. reason: Vnode stopped")
         else:
             tdLog.exit("The benchmark process has not stopped!")
 
-
-    def dbInsertThread(self):
-        tdLog.info(f"dbInsertThread start")
-        # taosBenchmark run
-        cmd = "-d db -t 10000 -n 10000 -T 4 -I stmt -y"
-        self._rlist = self.benchmark(cmd, checkRun=False)
-
     # run
     def do_insert_error_exit(self):
-        # init
         self._rlist = None
-   
-        tdLog.info(f"start to excute {__file__}")
-        t1 = threading.Thread(target=self.dbInsertThread)
+        tdLog.info(f"start to execute {__file__} - insert error exit")
+
+        # Use enough tables so benchmark is still running when dnode stops
+        cmd = "-d db -t 10000 -n 10000 -T 4 -I stmt -y"
+        t1 = threading.Thread(target=self.dbInsertThread, args=(cmd,))
         t2 = threading.Thread(target=self.dnodeNodeStopThread)
         t1.start()
         t2.start()
-
         t1.join()
         t2.join()
 
-        print("do insert error exit .................. [passed]")
+        tdLog.info("do insert error exit .................. [passed]")
 
 
     #

test/cases/82-UnitTest/test.sh

@@ -43,7 +43,7 @@ sleep 10
 
 # Run ctest and capture output and return code
 ctest_output="unit-test.log"
-ctest -E "cunit_test|pcre*|example*|clientTest|connectOptionsTest|stmtTest|stmt2Test|tssTest|tmqTest|catalogTest|taoscTest" -j8 2>&1 | tee "$ctest_output"
+ctest -E "cunit_test|pcre*|example*|clientTest|connectOptionsTest|tmqTest|taoscTest" -j8 2>&1 | tee "$ctest_output"
 ctest_ret=${PIPESTATUS[0]}
 
 
@@ -61,10 +61,5 @@ fi
 
 build/bin/clientTest
 build/bin/connectOptionsTest 
-build/bin/stmtTest
-build/bin/stmt2Test
 build/bin/instanceTest
-build/bin/tssTest
-build/bin/tmqTest
-build/bin/catalogTest 
 build/bin/taoscTest

test/ci/cases.task

@@ -1007,7 +1007,7 @@
 ,,y,.,./ci/pytest.sh pytest cases/81-Tools/03-Benchmark/test_benchmark_commandline.py
 ,,y,.,./ci/pytest.sh pytest cases/81-Tools/03-Benchmark/test_benchmark_conn_mode.py -B
 ,,y,.,./ci/pytest.sh pytest cases/81-Tools/03-Benchmark/test_benchmark_datatypes.py
-,,y,.,./ci/pytest.sh pytest cases/81-Tools/03-Benchmark/test_benchmark_except.py
+90,,y,.,./ci/pytest.sh pytest cases/81-Tools/03-Benchmark/test_benchmark_except.py
 ,,y,.,./ci/pytest.sh pytest cases/81-Tools/03-Benchmark/test_benchmark_mix.py
 ,,y,.,./ci/pytest.sh pytest cases/81-Tools/03-Benchmark/test_benchmark_query_main.py
 ,,y,.,./ci/pytest.sh pytest cases/81-Tools/03-Benchmark/test_benchmark_query_rest.py -B