diff --git a/tests/pytest/tools/taosdemoAllTest/insertRestful.json b/tests/pytest/tools/taosdemoAllTest/insertRestful.json index cbb8f80c363f2a9d16edae0de53a52f2e1f3fcdf..d05e1c249f25c17c37e40626bf0d3c5a96e5fffe 100644 --- a/tests/pytest/tools/taosdemoAllTest/insertRestful.json +++ b/tests/pytest/tools/taosdemoAllTest/insertRestful.json @@ -40,7 +40,7 @@ "auto_create_table": "no", "batch_create_tbl_num": 10, "data_source": "rand", - "insert_mode": "restful", + "insert_mode": "rest", "insert_rows": 10, "childtable_limit": 0, "childtable_offset":0, diff --git a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py index 16477da8a34959f514fa12ad20400fab39847078..526401dafa7155ee750ccf2679a2dab8ea0f5575 100644 --- a/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py +++ b/tests/pytest/tools/taosdemoAllTest/taosdemoTestSubWithJson.py @@ -73,49 +73,49 @@ class TDTestCase: os.system("rm -rf ./subscribe_res*") os.system("rm -rf ./all_subscribe_res*") - # # subscribe: sync - # os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdata.json" % binPath) - # os.system("nohup %staosdemo -f tools/taosdemoAllTest/subSync.json &" % binPath) - # query_pid = int(subprocess.getstatusoutput('ps aux|grep "taosdemoAllTest/subSync.json" |grep -v "grep"|awk \'{print $2}\'')[1]) - - # # insert extral data - # tdSql.execute("use db") - # tdSql.execute("insert into stb00_0 values(1614218412000,'R','bf3',8637,98.861045)") - # tdSql.execute("insert into stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218422000,'R','bf3',8637,98.861045)") - # sleep(5) - - # # merge result files - # os.system("cat subscribe_res0.txt* > all_subscribe_res0.txt") - # os.system("cat subscribe_res1.txt* > all_subscribe_res1.txt") - # os.system("cat subscribe_res2.txt* > all_subscribe_res2.txt") - # os.system("cat subscribe_res3.txt* > all_subscribe_res3.txt") + # subscribe: sync + os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdata.json" % binPath) + os.system("nohup %staosdemo -f tools/taosdemoAllTest/subSync.json &" % binPath) + query_pid = int(subprocess.getstatusoutput('ps aux|grep "taosdemoAllTest/subSync.json" |grep -v "grep"|awk \'{print $2}\'')[1]) + + # insert extral data + tdSql.execute("use db") + tdSql.execute("insert into stb00_0 values(1614218412000,'R','bf3',8637,98.861045)") + tdSql.execute("insert into stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218422000,'R','bf3',8637,98.861045)") + sleep(5) + + # merge result files + os.system("cat subscribe_res0.txt* > all_subscribe_res0.txt") + os.system("cat subscribe_res1.txt* > all_subscribe_res1.txt") + os.system("cat subscribe_res2.txt* > all_subscribe_res2.txt") + os.system("cat subscribe_res3.txt* > all_subscribe_res3.txt") - # # correct subscribeTimes testcase - # subTimes0 = self.subTimes("all_subscribe_res0.txt") - # self.assertCheck("all_subscribe_res0.txt",subTimes0 ,22) + # correct subscribeTimes testcase + subTimes0 = self.subTimes("all_subscribe_res0.txt") + self.assertCheck("all_subscribe_res0.txt",subTimes0 ,22) - # subTimes1 = self.subTimes("all_subscribe_res1.txt") - # self.assertCheck("all_subscribe_res1.txt",subTimes1 ,24) + subTimes1 = self.subTimes("all_subscribe_res1.txt") + self.assertCheck("all_subscribe_res1.txt",subTimes1 ,24) - # subTimes2 = self.subTimes("all_subscribe_res2.txt") - # self.assertCheck("all_subscribe_res2.txt",subTimes2 ,21) + subTimes2 = self.subTimes("all_subscribe_res2.txt") + self.assertCheck("all_subscribe_res2.txt",subTimes2 ,21) - # subTimes3 = self.subTimes("all_subscribe_res3.txt") - # self.assertCheck("all_subscribe_res3.txt",subTimes3 ,13) + subTimes3 = self.subTimes("all_subscribe_res3.txt") + self.assertCheck("all_subscribe_res3.txt",subTimes3 ,13) - # # correct data testcase - # os.system("kill -9 %d" % query_pid) - # sleep(3) - # os.system("rm -rf ./subscribe_res*") - # os.system("rm -rf ./all_subscribe*") + # correct data testcase + os.system("kill -9 %d" % query_pid) + sleep(3) + os.system("rm -rf ./subscribe_res*") + os.system("rm -rf ./all_subscribe*") # sql number lager 100 - os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath) - # assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSpecMaxsql100.json" % binPath) != 0 - # assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSuperMaxsql100.json" % binPath) != 0 - os.system("%staosdemo -f tools/taosdemoAllTest/subSyncKeepStart.json" % binPath) + # os.system("%staosdemo -f tools/taosdemoAllTest/subInsertdataMaxsql100.json" % binPath) + # # assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSpecMaxsql100.json" % binPath) != 0 + # # assert os.system("%staosdemo -f tools/taosdemoAllTest/subSyncSuperMaxsql100.json" % binPath) != 0 + # os.system("%staosdemo -f tools/taosdemoAllTest/subSyncKeepStart.json" % binPath) # tdSql.execute("insert into db.stb00_1 values(1614218412000,'R','bf3',8637,78.861045)(1614218413000,'R','bf3',8637,98.861045)") @@ -142,9 +142,6 @@ class TDTestCase: # os.system("%staosdemo -f tools/taosdemoAllTest/subSupermaxsql100.json" % binPath) - - - # delete useless files os.system("rm -rf ./insert_res.txt")