Merge pull request #5138 from taosdata/xiaoping/add_test_case

Fix taosdemoTest2.py failure

tests/pytest/query/queryGroupbySort.py

@@ -46,6 +46,10 @@ class TDTestCase:
         tdSql.checkData(1, 0, "2018-10-03 14:38:15")
         tdSql.checkData(2, 0, "2018-10-03 14:38:16")
 
+        tdSql.error("SELECT SUM(current) as s, AVG(voltage) FROM meters WHERE groupId > 1 INTERVAL(1s) GROUP BY location order by s ASC")
+
+        tdSql.error("SELECT SUM(current) as s, AVG(voltage) FROM meters WHERE groupId > 1 INTERVAL(1s) GROUP BY location order by s DESC")
+        
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/pytest/tools/taosdemoTest2.py

@@ -33,13 +33,23 @@ class TDTestCase:
         if(threadID == 0):
             os.system("yes | taosdemo -t %d -n %d -x" % (self.numberOfTables, self.numberOfRecords))
         if(threadID == 1):
+            time.sleep(2)
             print("use test")
             tdSql.execute("use test")            
+            # check if all the tables have heen created
+            while True:
+                tdSql.query("show tables")
+                rows = tdSql.queryRows
+                print("number of tables: %d" % rows)
+                if(rows == self.numberOfTables):
+                    break
+                time.sleep(1)
+            # check if there are any records in the last created table
             while True:
                 print("query started")
                 tdSql.query("select * from test.t9")
                 rows = tdSql.queryRows
-                print("rows %d" % rows)
+                print("number of records: %d" % rows)
                 if(rows > 0):
                     break
                 time.sleep(1)      
@@ -55,7 +65,6 @@ class TDTestCase:
         t2 = threading.Thread(target=self.insertDataAndAlterTable, args=(1, ))
 
         t1.start()        
-        time.sleep(2)     
         t2.start()
         t1.join()
         t2.join()