diff --git a/tests/pytest/restful/restful_bind_db1.py b/tests/pytest/restful/restful_bind_db1.py index 2ea1ecc4f4..9620535fd7 100644 --- a/tests/pytest/restful/restful_bind_db1.py +++ b/tests/pytest/restful/restful_bind_db1.py @@ -22,8 +22,6 @@ from util.log import * from util.cases import * from util.sql import * import time, datetime - - import requests, json import threading import string @@ -97,31 +95,23 @@ class TDTestCase(): "insert into test.tb values (now , 2, 2.0) ", "select * from tb", "select * from test.tb"] - for sql in sqls: print("===================") check_unbind_db(url,sql,header) print("==================="*5) - print(" check bind db about restful ") - print("==================="*5) - url = "http://127.0.0.1:6041/rest/sql/des" for sql in sqls: print("===================") check_bind_db(url,sql,header) - # check data - tdSql.query("select * from test.tb") tdSql.checkRows(1) tdSql.query("select * from des.tb") tdSql.checkRows(2) - - os.system('sudo timedatectl set-ntp on') @@ -129,6 +119,5 @@ class TDTestCase(): tdSql.close() tdLog.success("%s successfully executed" % __file__) - tdCases.addWindows(__file__, TDTestCase()) -tdCases.addLinux(__file__, TDTestCase()) \ No newline at end of file +tdCases.addLinux(__file__, TDTestCase()) diff --git a/tests/pytest/restful/restful_bind_db2.py b/tests/pytest/restful/restful_bind_db2.py index bdf3ae8757..35aa1408a7 100644 --- a/tests/pytest/restful/restful_bind_db2.py +++ b/tests/pytest/restful/restful_bind_db2.py @@ -22,13 +22,10 @@ from util.log import * from util.cases import * from util.sql import * import time, datetime - - import requests, json import threading import string import random - def check_res(url, data, header): resp = requests.post(url, data, headers = header ) @@ -49,7 +46,6 @@ class TDTestCase(): def init(self, conn, logSql): tdLog.debug("start to execute %s" % __file__) tdSql.init(conn.cursor(), logSql) - def run(self): tdSql.prepare() @@ -59,7 +55,6 @@ class TDTestCase(): tdSql.execute('drop database if exists des') tdSql.execute('create database test') tdSql.execute('create database des') - header = {'Authorization': 'Basic cm9vdDp0YW9zZGF0YQ=='} url = "http://127.0.0.1:6041/rest/sql/" @@ -87,8 +82,6 @@ class TDTestCase(): "select * from test.tb", "create table des.tb (ts timestamp, id int , data double)", "insert into des.tb values (now , 3, 3.0)"] - - for sql in sqls: print("===================") if sql == "create table test.tb (ts timestamp, id int , data double)": @@ -103,14 +96,10 @@ class TDTestCase(): tdSql.query("select * from des.tb") tdSql.checkRows(1) - print("==================="*5) - print(" check bind db about restful ") - print("==================="*5) - tdSql.execute('reset query cache') tdSql.execute('drop database if exists test') tdSql.execute('drop database if exists db') @@ -127,33 +116,11 @@ class TDTestCase(): print ("%s run occur error as expect ,check pass!" %(sql)) else: check_res(url,sql,header) - # check data - tdSql.query("select * from test.tb") tdSql.checkRows(1) tdSql.query("select * from des.tb") tdSql.checkRows(3) - - - - - - - # curl(url ,data , header) - - - - # threads = [] - # for i in range(self.numOfThreads): - # thread = threading.Thread(target=self.insertData, args=(i,)) - # thread.start() - # threads.append(thread) - - - - - os.system('sudo timedatectl set-ntp on') @@ -163,4 +130,4 @@ class TDTestCase(): tdCases.addWindows(__file__, TDTestCase()) -tdCases.addLinux(__file__, TDTestCase()) \ No newline at end of file +tdCases.addLinux(__file__, TDTestCase())