[TD-2984] <fix>: combine taosdemo and taosdemox.

tests/pytest/tools/taosdemoTest.py

@@ -26,6 +26,7 @@ class TDTestCase:
 
         self.numberOfTables = 10000
         self.numberOfRecords = 100
+
     def getBuildPath(self):
         selfPath = os.path.dirname(os.path.realpath(__file__))
 
@@ -38,9 +39,10 @@ class TDTestCase:
             if ("taosd" in files):
                 rootRealPath = os.path.dirname(os.path.realpath(root))
                 if ("packaging" not in rootRealPath):
-                    buildPath = root[:len(root)-len("/build/bin")]
+                    buildPath = root[:len(root) - len("/build/bin")]
                     break
         return buildPath
+
     def run(self):
         tdSql.prepare()
         buildPath = self.getBuildPath()
@@ -48,17 +50,20 @@ class TDTestCase:
             tdLog.exit("taosd not found!")
         else:
             tdLog.info("taosd found in %s" % buildPath)
-        binPath = buildPath+ "/build/bin/"
-        os.system("%staosdemo -y -M -t %d -n %d -x" % (binPath,self.numberOfTables, self.numberOfRecords))
+        binPath = buildPath + "/build/bin/"
+        os.system("%staosdemo -y -M -t %d -n %d -x" %
+                  (binPath, self.numberOfTables, self.numberOfRecords))
 
         tdSql.execute("use test")
         tdSql.query("select count(*) from meters")
         tdSql.checkData(0, 0, self.numberOfTables * self.numberOfRecords)
 
-        tdSql.query("select sum(col1) from test.meters interval(1h) sliding(30m)")
+        tdSql.query(
+            "select sum(col1) from test.meters interval(1h) sliding(30m)")
         tdSql.checkRows(2)
 
-        tdSql.query("select apercentile(col1, 1) from test.meters interval(10s)")
+        tdSql.query(
+            "select apercentile(col1, 1) from test.meters interval(10s)")
         tdSql.checkRows(1)
 
         tdSql.error("select loc, count(loc) from test.meters")

tests/pytest/tools/taosdemoTest2.py

@@ -31,7 +31,8 @@ class TDTestCase:
 
     def insertDataAndAlterTable(self, threadID):
         if(threadID == 0):
-            os.system("yes | taosdemo -t %d -n %d -x" % (self.numberOfTables, self.numberOfRecords))
+            os.system("taosdemo -y -t %d -n %d -x" %
+                      (self.numberOfTables, self.numberOfRecords))
         if(threadID == 1):
             time.sleep(2)
             print("use test")