fix test cases

tests/system-test/0-others/sysinfo.py

@@ -33,14 +33,14 @@ class TDTestCase:
         tdSql.query('select database()')
         tdSql.checkData(0,0,self.dbname)
         tdSql.execute(f'drop database {self.dbname}')
-        
+
     def check_version(self):
         taos_list = ['server','client']
         for i in taos_list:
             tdSql.query(f'select {i}_version()')
             version_info = str(subprocess.run('cat ../../source/util/src/version.c |grep "char version"', shell=True,capture_output=True).stdout.decode('utf8')).split('"')[1]
             tdSql.checkData(0,0,version_info)
-        
+
     def get_server_status(self):
         sleep(self.delaytime)
         tdSql.query('select server_status()')
@@ -51,7 +51,7 @@ class TDTestCase:
         if platform.system().lower() == 'windows':
             sleep(10)
         tdSql.error('select server_status()')
-        
+
     def run(self):
         self.get_database_info()
         self.check_version()
@@ -61,4 +61,4 @@ class TDTestCase:
         tdLog.success("%s successfully executed" % __file__)
 
 tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/system-test/0-others/taosShellNetChk.py

@@ -18,7 +18,7 @@ from util.dnodes import *
 def taos_command (buildPath, key, value, expectString, cfgDir, sqlString='', key1='', value1=''):
     if len(key) == 0:
         tdLog.exit("taos test key is null!")
-    
+
     if platform.system().lower() == 'windows':
         taosCmd = buildPath + '\\build\\bin\\taos.exe '
         taosCmd = taosCmd.replace('\\','\\\\')
@@ -158,34 +158,34 @@ class TDTestCase:
         if "2: service ok" in retVal:
             tdLog.info("taos -k success")
         else:
-            tdLog.info(retVal)  
+            tdLog.info(retVal)
             tdLog.exit("taos -k fail 1")
 
         # stop taosd
         tdDnodes.stop(1)
         #sleep(10)
         #tdDnodes.start(1)
-        #sleep(5) 
+        #sleep(5)
         retCode, retVal = taos_command(buildPath, "k", '', "", keyDict['c'], sqlString)
         if "0: unavailable" in retVal:
             tdLog.info("taos -k success")
         else:
-            tdLog.info(retVal)  
+            tdLog.info(retVal)
             tdLog.exit("taos -k fail 2")
 
         # restart taosd
         tdDnodes.start(1)
-        #sleep(5) 
+        #sleep(5)
         retCode, retVal = taos_command(buildPath, "k", '', "", keyDict['c'], sqlString)
         if "2: service ok" in retVal:
             tdLog.info("taos -k success")
         else:
-            tdLog.info(retVal)  
+            tdLog.info(retVal)
             tdLog.exit("taos -k fail 3")
 
         tdLog.printNoPrefix("================================ parameter: -n")
         # stop taosd
-        tdDnodes.stop(1)        
+        tdDnodes.stop(1)
 
         try:
             role   = 'server'
@@ -220,7 +220,7 @@ class TDTestCase:
             #print(child.after.decode())
             if i == 0:
                 tdLog.exit('taos -n server fail!')
-            
+
             expectString1 = 'response is received, size:' + pktLen
             expectSTring2 = pktNum + '/' + pktNum
             if expectString1 in retResult and expectSTring2 in retResult:

tests/system-test/0-others/taosdMonitor.py

@@ -51,7 +51,7 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
 
         if "version" not in infoDict["cluster_info"] or infoDict["cluster_info"]["version"] == None:
             tdLog.exit("first_ep_dnode_id is null!")
-        
+
         if "master_uptime" not in infoDict["cluster_info"] or infoDict["cluster_info"]["master_uptime"] == None:
             tdLog.exit("master_uptime is null!")
 
@@ -69,13 +69,13 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
 
         if "dnodes" not in infoDict["cluster_info"] or infoDict["cluster_info"]["dnodes"] == None :
             tdLog.exit("dnodes is null!")
-        
+
         dnodes_info = { "dnode_id": 1,"dnode_ep": self.hostPort,"status":"ready"}
-        
+
         for k ,v in dnodes_info.items():
             if k not in infoDict["cluster_info"]["dnodes"][0] or v != infoDict["cluster_info"]["dnodes"][0][k] :
                 tdLog.exit("dnodes info is null!")
-        
+
         mnodes_info = { "mnode_id":1, "mnode_ep": self.hostPort,"role": "leader" }
 
         for k ,v in mnodes_info.items():
@@ -86,7 +86,7 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
 
         if "vgroup_infos" not in infoDict or infoDict["vgroup_infos"]== None:
             tdLog.exit("vgroup_infos is null!")
-        
+
         vgroup_infos_nums = len(infoDict["vgroup_infos"])
 
         for  index in range(vgroup_infos_nums):
@@ -116,14 +116,14 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
 
         if "timeseries_total" not in infoDict["grant_info"] or not infoDict["grant_info"]["timeseries_total"] > 0:
             tdLog.exit("timeseries_total is null!")
-            
+
         # dnode_info  ====================================
 
         if "dnode_info" not in infoDict or infoDict["dnode_info"]== None:
             tdLog.exit("dnode_info is null!")
 
-        dnode_infos =  ['uptime', 'cpu_engine', 'cpu_system', 'cpu_cores', 'mem_engine', 'mem_system', 'mem_total', 'disk_engine', 
-        'disk_used', 'disk_total', 'net_in', 'net_out', 'io_read', 'io_write', 'io_read_disk', 'io_write_disk', 'req_select', 
+        dnode_infos =  ['uptime', 'cpu_engine', 'cpu_system', 'cpu_cores', 'mem_engine', 'mem_system', 'mem_total', 'disk_engine',
+        'disk_used', 'disk_total', 'net_in', 'net_out', 'io_read', 'io_write', 'io_read_disk', 'io_write_disk', 'req_select',
         'req_select_rate', 'req_insert', 'req_insert_success', 'req_insert_rate', 'req_insert_batch', 'req_insert_batch_success',
         'req_insert_batch_rate', 'errors', 'vnodes_num', 'masters', 'has_mnode', 'has_qnode', 'has_snode', 'has_bnode']
         for elem in dnode_infos:
@@ -134,7 +134,7 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
 
         if "disk_infos" not in infoDict or infoDict["disk_infos"]== None:
             tdLog.exit("disk_infos is null!")
-        
+
         # bug for data_dir
         if "datadir" not in infoDict["disk_infos"] or len(infoDict["disk_infos"]["datadir"]) <=0 :
             tdLog.exit("datadir is null!")
@@ -187,7 +187,7 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
 
 
         # log_infos  ====================================
-        
+
         if "log_infos" not in infoDict or infoDict["log_infos"]== None:
             tdLog.exit("log_infos is null!")
 
@@ -206,13 +206,13 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
         if "summary" not in infoDict["log_infos"] or len(infoDict["log_infos"]["summary"])!= 4:
             tdLog.exit("summary is null!")
 
-        
+
         if "total" not in infoDict["log_infos"]["summary"][0] or infoDict["log_infos"]["summary"][0]["total"] < 0 :
             tdLog.exit("total is null!")
 
         if "level" not in infoDict["log_infos"]["summary"][0] or infoDict["log_infos"]["summary"][0]["level"] not in ["error" ,"info" , "debug" ,"trace"]:
             tdLog.exit("level is null!")
-     
+
     def do_GET(self):
         """
         process GET request
@@ -227,25 +227,25 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
         if contentEncoding == 'gzip':
             req_body = self.rfile.read(int(self.headers["Content-Length"]))
             plainText = gzip.decompress(req_body).decode()
-        else: 
+        else:
             plainText = self.rfile.read(int(self.headers["Content-Length"])).decode()
-            
+
         print(plainText)
         # 1. send response code and header
-        self.send_response(200)        
+        self.send_response(200)
         self.send_header("Content-Type", "text/html; charset=utf-8")
         self.end_headers()
-        
+
         # 2. send response content
         #self.wfile.write(("Hello World: " + req_body + "\n").encode("utf-8"))
-        
+
         # 3. check request body info
         infoDict = json.loads(plainText)
         #print("================")
         # print(infoDict)
         self.telemetryInfoCheck(infoDict)
 
-        # 4. shutdown the server and exit case 
+        # 4. shutdown the server and exit case
         assassin = threading.Thread(target=self.server.shutdown)
         assassin.daemon = True
         assassin.start()
@@ -287,7 +287,7 @@ class TDTestCase:
     def init(self, conn, logSql):
         tdLog.debug(f"start to excute {__file__}")
         tdSql.init(conn.cursor())
-    
+
     def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
         tdSql.prepare()
         # time.sleep(2)

tests/system-test/0-others/telemetry.py

@@ -100,9 +100,9 @@ def telemetryInfoCheck(infoDict=''):
 
     if "compStorage" not in infoDict or infoDict["compStorage"] < 0:
         tdLog.exit("compStorage is null!")
-    
 
-class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):    
+
+class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
     def do_GET(self):
         """
         process GET request
@@ -117,26 +117,26 @@ class RequestHandlerImpl(http.server.BaseHTTPRequestHandler):
         if contentEncoding == 'gzip':
             req_body = self.rfile.read(int(self.headers["Content-Length"]))
             plainText = gzip.decompress(req_body).decode()
-        else: 
+        else:
             plainText = self.rfile.read(int(self.headers["Content-Length"])).decode()
 
         print("monitor info:\n%s"%plainText)
 
         # 1. send response code and header
-        self.send_response(200)        
+        self.send_response(200)
         self.send_header("Content-Type", "text/html; charset=utf-8")
         self.end_headers()
-        
+
         # 2. send response content
         #self.wfile.write(("Hello World: " + req_body + "\n").encode("utf-8"))
-        
+
         # 3. check request body info
         infoDict = json.loads(plainText)
         #print("================")
         #print(infoDict)
         telemetryInfoCheck(infoDict)
 
-        # 4. shutdown the server and exit case 
+        # 4. shutdown the server and exit case
         assassin = threading.Thread(target=self.server.shutdown)
         assassin.daemon = True
         assassin.start()
@@ -176,7 +176,7 @@ class TDTestCase:
     def init(self, conn, logSql):
         tdLog.debug(f"start to excute {__file__}")
         tdSql.init(conn.cursor())
-    
+
     def run(self):  # sourcery skip: extract-duplicate-method, remove-redundant-fstring
         tdSql.prepare()
         # time.sleep(2)