Merge pull request #4547 from taosdata/test/jenkins

[TD-2348]reduce sleep time in test cases

tests/pytest/concurrent_inquiry.py

@@ -166,7 +166,7 @@ class ConcurrentInquiry:
         sel_col_list=[]
         col_rand=random.randint(0,len(col_list))
         for i,j in zip(col_list[0:col_rand],func_list):         #决定每个被查询col的函数
-            alias = 'as '+ str(i)
+            alias = ' as '+ str(i)
             pick_func = ''
             if j == 'leastsquares':
                 pick_func=j+'('+i+',1,1)'

tests/pytest/query/queryNullValueTest.py

@@ -50,7 +50,7 @@ class TDTestCase:
             tdSql.execute("insert into t0 values (%d, NULL)" % (self.ts))
             
             tdDnodes.stop(1)
-            tdLog.sleep(10)
+            # tdLog.sleep(10)
             tdDnodes.start(1)
             tdSql.execute("use db")
             tdSql.query("select * from t0")
@@ -62,7 +62,7 @@ class TDTestCase:
             tdSql.execute("create table t1 (ts timestamp, col %s)" % self.types[i])
             tdSql.execute("insert into t1 values (%d, NULL)" % (self.ts))
             tdDnodes.stop(1)
-            tdLog.sleep(10)
+            # tdLog.sleep(10)
             tdDnodes.start(1)
             tdSql.execute("use db")
 

tests/pytest/update/append_commit_data.py

@@ -38,38 +38,62 @@ class TDTestCase:
 
         insertRows = 200
         t0 = 1604298064000
+        sql='insert into db.t1 values '
+        temp=''
         tdLog.info("insert %d rows" % (insertRows))
         for i in range(0, insertRows):
+          # ret = tdSql.execute(
+          #     'insert into t1 values (%d , 1)' %
+          #     (t0+i))
+          temp += '(%d,1)' %(t0+i)
+          if i % 100 == 0 or i == (insertRows - 1 ):
+            print(sql+temp)
             ret = tdSql.execute(
-              'insert into t1 values (%d , 1)' %
-              (t0+i))
+                sql+temp
+            )
+            temp = ''
         print("==========step2")
         print("restart to commit ")
         tdDnodes.stop(1)
         tdDnodes.start(1)
         tdSql.query("select * from db.t1")
         tdSql.checkRows(insertRows)
+        
         for k in range(0,100):
           tdLog.info("insert %d rows" % (insertRows))
+          temp=''
           for i in range (0,insertRows):
+            temp += '(%d,1)' %(t0+k*200+i)
+            if i % 100 == 0 or i == (insertRows - 1 ):
+              print(sql+temp)
               ret = tdSql.execute(
-                'insert into db.t1 values(%d,1)' %
-                (t0+k*200+i)
+                  sql+temp
               )
+              temp = ''
+            
           tdDnodes.stop(1)
           tdDnodes.start(1)
           tdSql.query("select * from db.t1")
           tdSql.checkRows(insertRows+200*k)
-        print("==========step2")
+        print("==========step3")
         print("insert into another table ")
         s = 'use db'
         tdSql.execute(s)
         ret = tdSql.execute('create table t2 (ts timestamp, a int)')
         insertRows = 20000
+        sql = 'insert into t2 values '
+        temp = ''
         for i in range(0, insertRows):
+          # ret = tdSql.execute(
+          #     'insert into t2 values (%d, 1)' %
+          #     (t0+i))
+          temp += '(%d,1)' %(t0+i)
+          if i % 500 == 0 or i == (insertRows - 1 ):
+            print(sql+temp)
             ret = tdSql.execute(
-              'insert into t2 values (%d, 1)' %
-              (t0+i))
+                sql+temp
+            )
+            temp = ''
         tdDnodes.stop(1)
         tdDnodes.start(1)
         tdSql.query("select * from t2")

tests/pytest/util/dnodes.py

@@ -255,9 +255,19 @@ class TDDnode:
             tdLog.exit(cmd)
         self.running = 1
         tdLog.debug("dnode:%d is running with %s " % (self.index, cmd))
+        time.sleep(0.1)
+        key = 'from offline to online'
+        bkey = bytes(key,encoding="utf8")
+        logFile = self.logDir + "/taosdlog.0"
+        popen = subprocess.Popen('tail -f ' + logFile, stdout=subprocess.PIPE, stderr=subprocess.PIPE, shell=True)
+        while True:
+            line = popen.stdout.readline().strip()
+            if bkey in line:
+                popen.kill()
+                break
+        tdLog.debug("the dnode:%d has been started." % (self.index))
         
-        tdLog.debug("wait 5 seconds for the dnode:%d to start." % (self.index))
-        time.sleep(5)
+        # time.sleep(5)
     
     def startWithoutSleep(self):
         buildPath = self.getBuildPath()