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

[TD-3453]<test>:modify filepath in scripts

This commit is contained in:
tomchon 2021-04-23 11:25:08 +08:00
parent 7eba44be08
commit 46905c402a
3 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tests/pytest/tools/taosdemoAllTest/TD-3453/query-interrupt.json
View File

@ -35,13 +35,13 @@
"super_tables": [{ "super_tables": [{
"name": "stb0", "name": "stb0",
"child_table_exists":"no", "child_table_exists":"no",
"childtable_count": 100, "childtable_count": 60,
"childtable_prefix": "stb00_", "childtable_prefix": "stb00_",
"auto_create_table": "no", "auto_create_table": "no",
"batch_create_tbl_num": 20, "batch_create_tbl_num": 20,
"data_source": "rand", "data_source": "rand",
"insert_mode": "taosc", "insert_mode": "taosc",
"insert_rows": 150000, "insert_rows": 100000,
"childtable_limit": -1, "childtable_limit": -1,
"childtable_offset":0, "childtable_offset":0,
"multi_thread_write_one_tbl": "no", "multi_thread_write_one_tbl": "no",

7
tests/pytest/tools/taosdemoAllTest/TD-3453/query-interrupt.py
View File

@ -52,15 +52,15 @@ class TDTestCase:
binPath = buildPath+ "/build/bin/" binPath = buildPath+ "/build/bin/"
# # insert 1000w rows in stb0 # # insert 1000w rows in stb0
os.system("%staosdemo -f tools/taosdemoAllTest/query-interrupt.json -y " % binPath) os.system("%staosdemo -f tools/taosdemoAllTest/TD-3453/query-interrupt.json -y " % binPath)
tdSql.execute("use db") tdSql.execute("use db")
tdSql.query("select count (tbname) from stb0") tdSql.query("select count (tbname) from stb0")
tdSql.checkData(0, 0,60) tdSql.checkData(0, 0,60)
tdSql.query("select count(*) from stb0") tdSql.query("select count(*) from stb0")
tdSql.checkData(0, 0, 6000000) tdSql.checkData(0, 0, 6000000)
os.system('%staosdemo -f tools/taosdemoAllTest/queryall.json -y & ' % binPath) os.system('%staosdemo -f tools/taosdemoAllTest/TD-3453/queryall.json -y & ' % binPath)
time.sleep(2) time.sleep(2)
query_pid = int(subprocess.getstatusoutput('ps aux|grep "taosdemoAllTest/queryall.json" |grep -v "grep"|awk \'{print $2}\'')[1]) query_pid = int(subprocess.getstatusoutput('ps aux|grep "TD-3453/queryall.json" |grep -v "grep"|awk \'{print $2}\'')[1])
taosd_cpu_load_1 = float(subprocess.getstatusoutput('top -n 1 -b -p $(ps aux|grep "bin/taosd -c"|grep -v "grep" |awk \'{print $2}\')|awk \'END{print}\' |awk \'{print $9}\'')[1]) taosd_cpu_load_1 = float(subprocess.getstatusoutput('top -n 1 -b -p $(ps aux|grep "bin/taosd -c"|grep -v "grep" |awk \'{print $2}\')|awk \'END{print}\' |awk \'{print $9}\'')[1])
if taosd_cpu_load_1 > 10.0 : if taosd_cpu_load_1 > 10.0 :
os.system("kill -9 %d" % query_pid) os.system("kill -9 %d" % query_pid)
@ -78,6 +78,7 @@ class TDTestCase:
tdSql.checkData(0, 0, "%d" % suc_kill) tdSql.checkData(0, 0, "%d" % suc_kill)
os.system("rm -rf querySystemInfo*") os.system("rm -rf querySystemInfo*")
os.system("rm -rf insert_res.txt") os.system("rm -rf insert_res.txt")
os.system("rm -rf insert_res.txt")
def stop(self): def stop(self):
tdSql.close() tdSql.close()

14
tests/pytest/tools/taosdemoAllTest/TD-3453/queryall.json
View File

@ -7,8 +7,14 @@
"password": "taosdata", "password": "taosdata",
"confirm_parameter_prompt": "no", "confirm_parameter_prompt": "no",
"databases": "db", "databases": "db",
"specified_table_query": "specified_table_query":{
{"query_interval":1, "concurrent":1, "query_interval":1,
"sqls": [{"sql": "select * from stb0", "result": ""}] "concurrent":1,
} "sqls":[
{
"sql": "select * from stb0",
"result": ""
}
]
}
} }