xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix tsma test case

This commit is contained in:
wangjiaming0909 2024-10-24 10:08:44 +08:00
parent 58bcde2083
commit cd33915492
2 changed files with 22 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
tests/system-test/2-query/tsma.py
View File

@ -693,7 +693,7 @@ class TDTestCase:
"======== prepare test env include database, stable, ctables, and insert data: ") "======== prepare test env include database, stable, ctables, and insert data: ")
paraDict = {'dbName': db, paraDict = {'dbName': db,
'dropFlag': 1, 'dropFlag': 1,
'vgroups': 2, 'vgroups': 4,
'stbName': 'meters', 'stbName': 'meters',
'colPrefix': 'c', 'colPrefix': 'c',
'tagPrefix': 't', 'tagPrefix': 't',
@ -1273,6 +1273,21 @@ class TDTestCase:
else: else:
tdLog.debug(f'wait query succeed: {sql} to return {expected_row_num}, got: {tdSql.getRows()}') 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): def test_drop_tsma(self):
function_name = sys._getframe().f_code.co_name function_name = sys._getframe().f_code.co_name
tdLog.debug(f'-----{function_name}------') tdLog.debug(f'-----{function_name}------')
@ -1339,14 +1354,14 @@ class TDTestCase:
tdSql.execute('alter table test.t0 ttl 2', queryTimes=1) tdSql.execute('alter table test.t0 ttl 2', queryTimes=1)
tdSql.execute('flush database test') tdSql.execute('flush database test')
res_tb = TSMAQCBuilder().md5('1.test.tsma1_t0') 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 # test drop multi tables
tdSql.execute('drop table test.t3, test.t4') tdSql.execute('drop table test.t3, test.t4')
res_tb = TSMAQCBuilder().md5('1.test.tsma1_t3') 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') 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 # test drop stream
tdSql.error('drop stream tsma1', -2147471088) ## TSMA must be dropped first tdSql.error('drop stream tsma1', -2147471088) ## TSMA must be dropped first

4
tests/system-test/test.py
View File

@ -24,6 +24,8 @@ import platform
import socket import socket
import threading import threading
import importlib import importlib
print(f"Python version: {sys.version}")
print(f"Version info: {sys.version_info}")
import toml import toml
sys.path.append("../pytest") sys.path.append("../pytest")
@ -687,6 +689,6 @@ if __name__ == "__main__":
if conn is not None: if conn is not None:
conn.close() conn.close()
if asan: if asan:
# tdDnodes.StopAllSigint() tdDnodes.StopAllSigint()
tdLog.info("Address sanitizer mode finished") tdLog.info("Address sanitizer mode finished")
sys.exit(0) sys.exit(0)