From cd33915492c20c8349a0391c335d1acb7ba0c0f7 Mon Sep 17 00:00:00 2001
From: wangjiaming0909 <604227650@qq.com>
Date: Thu, 24 Oct 2024 10:08:44 +0800
Subject: [PATCH] fix tsma test case

---
 tests/system-test/2-query/tsma.py | 23 +++++++++++++++++++----
 tests/system-test/test.py         |  4 +++-
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/tests/system-test/2-query/tsma.py b/tests/system-test/2-query/tsma.py
index 1e115cff79..acde26d5ca 100644
--- a/tests/system-test/2-query/tsma.py
+++ b/tests/system-test/2-query/tsma.py
@@ -693,7 +693,7 @@ class TDTestCase:
             "======== prepare test env include database, stable, ctables, and insert data: ")
         paraDict = {'dbName':     db,
                     'dropFlag':   1,
-                    'vgroups':    2,
+                    'vgroups':    4,
                     'stbName':    'meters',
                     'colPrefix':  'c',
                     'tagPrefix':  't',
@@ -1273,6 +1273,21 @@ class TDTestCase:
         else:
             tdLog.debug(f'wait query succeed: {sql} to return {expected_row_num}, got: {tdSql.getRows()}')
 
+    def wait_query_err(self, sql: str, timeout_in_seconds: float, err):
+        timeout = timeout_in_seconds
+        while timeout > 0:
+            try:
+                tdSql.query(sql, queryTimes=1)
+                time.sleep(1)
+                timeout = timeout - 1
+            except:
+                tdSql.error(sql, err);
+                break
+        if timeout <= 0:
+            tdLog.exit(f'failed to wait query: {sql} to return error timeout: {timeout_in_seconds}s')
+        else:
+            tdLog.debug(f'wait query error succeed: {sql}')
+
     def test_drop_tsma(self):
         function_name = sys._getframe().f_code.co_name
         tdLog.debug(f'-----{function_name}------')
@@ -1339,14 +1354,14 @@ class TDTestCase:
         tdSql.execute('alter table test.t0 ttl 2', queryTimes=1)
         tdSql.execute('flush database test')
         res_tb = TSMAQCBuilder().md5('1.test.tsma1_t0')
-        self.wait_query(f'select * from information_schema.ins_tables where table_name = "{res_tb}"', 0, wait_query_seconds)
+        self.wait_query_err(f'desc `{res_tb}`', wait_query_seconds, -2147473917)
 
         # test drop multi tables
         tdSql.execute('drop table test.t3, test.t4')
         res_tb = TSMAQCBuilder().md5('1.test.tsma1_t3')
-        self.wait_query(f'select * from information_schema.ins_tables where table_name = "{res_tb}"', 0, wait_query_seconds)
+        self.wait_query_err(f'desc `{res_tb}`', wait_query_seconds, -2147473917)
         res_tb = TSMAQCBuilder().md5('1.test.tsma1_t4')
-        self.wait_query(f'select * from information_schema.ins_tables where table_name = "{res_tb}"', 0, wait_query_seconds)
+        self.wait_query_err(f'desc `{res_tb}`', wait_query_seconds, -2147473917)
 
         # test drop stream
         tdSql.error('drop stream tsma1', -2147471088) ## TSMA must be dropped first
diff --git a/tests/system-test/test.py b/tests/system-test/test.py
index 9defcd083a..57a4789f2e 100644
--- a/tests/system-test/test.py
+++ b/tests/system-test/test.py
@@ -24,6 +24,8 @@ import platform
 import socket
 import threading
 import importlib
+print(f"Python version: {sys.version}")
+print(f"Version info: {sys.version_info}")
 
 import toml
 sys.path.append("../pytest")
@@ -687,6 +689,6 @@ if __name__ == "__main__":
     if conn is not None:
         conn.close()
     if asan:
-        # tdDnodes.StopAllSigint()
+        tdDnodes.StopAllSigint()
         tdLog.info("Address sanitizer mode finished")
     sys.exit(0)