Merge pull request #9111 from taosdata/tomchon-patch-13

[TD-12143]<test>:modify cfgPath

tests/pytest/functions/variable_httpDbNameMandatory.py

@@ -34,11 +34,15 @@ class TDTestCase:
 
     def getBuildPath(self) -> str:
         selfPath = os.path.dirname(os.path.realpath(__file__))
+        global cfgPath
 
         if ("community" in selfPath):
             projPath = selfPath[:selfPath.find("community")]
+            cfgPath = projPath + "/community/sim/dnode1/cfg"
         else:
             projPath = selfPath[:selfPath.find("tests")]
+            cfgPath = projPath + "/sim/dnode1/cfg"
+
 
         for root, dirs, files in os.walk(projPath):
             if ("taosd" in files):
@@ -53,8 +57,10 @@ class TDTestCase:
 
         if ("community" in selfPath):
             cfgDir = self.getBuildPath() + "/community/sim/dnode1/cfg"
+            
         else:
             cfgDir = self.getBuildPath() + "/sim/dnode1/cfg"
+
         return cfgDir
 
     def getCfgFile(self) -> str:
@@ -85,8 +91,8 @@ class TDTestCase:
     def TS834(self):
         tdLog.printNoPrefix("==========TS-782==========")
         tdSql.prepare()
-
-        cfgfile = self.getCfgFile()
+        buildPath = self.getBuildPath()
+        cfgfile = cfgPath + "/taos.cfg"
 
         tdSql.execute("show variables")
         res_com = tdSql.cursor.fetchall()

tests/pytest/import_merge/import_update_0.py

@@ -414,7 +414,7 @@ class TDTestCase:
             tdSql.execute('''insert into regular_table_1 values(%d, %d, %d, %d, %d, false, 'binary%s', 'nchar%s', %f, %f, %d)''' 
                         % (self.ts + i, random.randint(-2147483647, 2147483647), 
                         random.randint(-9223372036854775807, 9223372036854775807), random.randint(-32767, 32767),
-                        random.randint(-127, 127), random.randint(-100, 100), random.randint(-10000, 10000), 
+                        random.randint(-127, 127), random.randint(-99, 99), random.randint(-9999, 9999),
                         random.uniform(-100000,100000), random.uniform(-1000000000,1000000000), self.ts + i))
 
             tdSql.execute('''insert into table_1 values(%d, %d, %d, %d, %d, 0, 'binary.%s', 'nchar.%s', %f, %f, %d)''' 
@@ -422,7 +422,7 @@ class TDTestCase:
             tdSql.execute('''insert into table_1 values(%d, %d, %d, %d, %d, false, 'binary%s', 'nchar%s', %f, %f, %d)''' 
                         % (self.ts + i, random.randint(-2147483647, 2147483647), 
                         random.randint(-9223372036854775807, 9223372036854775807), random.randint(-32767, 32767),
-                        random.randint(-127, 127), random.randint(-100, 100), random.randint(-10000, 10000), 
+                        random.randint(-127, 127), random.randint(-99, 99), random.randint(-9999, 9999), 
                         random.uniform(-100000,100000), random.uniform(-1000000000,1000000000), self.ts + i))
 
         tdLog.info("========== regular_table ==========") 
@@ -1910,4 +1910,4 @@ class TDTestCase:
 
 
 tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/import_update_1.py

@@ -414,7 +414,7 @@ class TDTestCase:
             tdSql.execute('''insert into regular_table_1 values(%d, %d, %d, %d, %d, false, 'binary%s', 'nchar%s', %f, %f, %d)''' 
                         % (self.ts + i, random.randint(-2147483647, 2147483647), 
                         random.randint(-9223372036854775807, 9223372036854775807), random.randint(-32767, 32767),
-                        random.randint(-127, 127), random.randint(-100, 100), random.randint(-10000, 10000), 
+                        random.randint(-127, 127), random.randint(-99, 99), random.randint(-9999, 9999), 
                         random.uniform(-100000,100000), random.uniform(-1000000000,1000000000), self.ts + i))
 
             tdSql.execute('''insert into table_1 values(%d, %d, %d, %d, %d, 0, 'binary.%s', 'nchar.%s', %f, %f, %d)''' 
@@ -1910,4 +1910,4 @@ class TDTestCase:
 
 
 tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/import_merge/import_update_2.py

@@ -414,7 +414,7 @@ class TDTestCase:
             tdSql.execute('''insert into regular_table_1 values(%d, %d, %d, %d, %d, false, 'binary%s', 'nchar%s', %f, %f, %d)''' 
                         % (self.ts + i, random.randint(-2147483647, 2147483647), 
                         random.randint(-9223372036854775807, 9223372036854775807), random.randint(-32767, 32767),
-                        random.randint(-127, 127), random.randint(-100, 100), random.randint(-10000, 10000), 
+                        random.randint(-127, 127), random.randint(-99, 99), random.randint(-9999, 9999),
                         random.uniform(-100000,100000), random.uniform(-1000000000,1000000000), self.ts + i))
 
             tdSql.execute('''insert into table_1 values(%d, %d, %d, %d, %d, 0, 'binary.%s', 'nchar.%s', %f, %f, %d)''' 
@@ -422,7 +422,7 @@ class TDTestCase:
             tdSql.execute('''insert into table_1 values(%d, %d, %d, %d, %d, false, 'binary%s', 'nchar%s', %f, %f, %d)''' 
                         % (self.ts + i, random.randint(-2147483647, 2147483647), 
                         random.randint(-9223372036854775807, 9223372036854775807), random.randint(-32767, 32767),
-                        random.randint(-127, 127), random.randint(-100, 100), random.randint(-10000, 10000), 
+                        random.randint(-127, 127), random.randint(-99, 99), random.randint(-9999, 9999),
                         random.uniform(-100000,100000), random.uniform(-1000000000,1000000000), self.ts + i))
 
         tdLog.info("========== regular_table ==========") 
@@ -2270,4 +2270,4 @@ class TDTestCase:
 
 
 tdCases.addWindows(__file__, TDTestCase())
-tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanosubscribe.py

@@ -59,6 +59,7 @@ class TDTestCase:
         assert subResult == expectResult , "Queryfile:%s ,result is %s != expect: %s" % args0    
 
     def run(self):
+        tdSql.prepare()
         buildPath = self.getBuildPath()
         if (buildPath == ""):
             tdLog.exit("taosd not found!")
@@ -66,24 +67,38 @@ class TDTestCase:
             tdLog.info("taosd found in %s" % buildPath)
         binPath = buildPath+ "/build/bin/"      
 
-        # clear env
-        os.system("ps -ef |grep 'taosdemoAllTest/taosdemoTestSupportNanoSubscribe.json' |grep -v 'grep' |awk '{print $2}'|xargs kill -9")
+        # clear envs
+
+        os.system("ps -aux |grep 'taosdemoAllTest/taosdemoTestSupportNanoSubscribe.json'  |awk '{print $2}'|xargs kill -9 >/dev/null 2>&1")
+        os.system("ps -aux |grep 'tools/taosdemoAllTest/NanoTestCase/taosdemoTestNanoDatabaseInsertForSub.json'  |awk '{print $2}'|xargs kill -9 >/dev/null 2>&1")
         os.system("rm -rf ./subscribe_res*")  
         os.system("rm -rf ./all_subscribe_res*")  
-        
 
         # insert data
-        os.system("%staosdemo -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestNanoDatabaseInsertForSub.json" % binPath)
-        os.system("nohup %staosdemo -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoSubscribe.json &" % binPath)
-        query_pid = int(subprocess.getstatusoutput('ps aux|grep "taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoSubscribe.json" |grep -v "grep"|awk \'{print $2}\'')[1])
-
+        os.system("nohup %staosdemo -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestNanoDatabaseInsertForSub.json & >/dev/null 2>&1" % binPath)
+        sleep(5)
+        tdSql.query("select count(*) from subnsdb.stb0")
+        if tdSql.checkData(0,0,100):
+            pass
+        else:
+            sleep(5)
+            tdSql.query("select count(*) from subnsdb.stb0")  # if records not write done ,sleep and wait records write done!
+        
+        os.system(" nohup %staosdemo -f tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoSubscribe.json & >/dev/null 2>&1" % binPath)
+        sleep(5)
 
+        if os.path.exists("./subscribe_res0.txt") and os.path.exists("./subscribe_res1.txt") and os.path.exists("./subscribe_res2.txt"):
+            pass
+        else:
+            sleep(5)   # make sure query is ok 
+        print('taosdemo query done!')
+            
         # merge result files
-        sleep(5)
+        
         os.system("cat subscribe_res0.txt* > all_subscribe_res0.txt")
         os.system("cat subscribe_res1.txt* > all_subscribe_res1.txt")
         os.system("cat subscribe_res2.txt* > all_subscribe_res2.txt")
-
+        sleep(5)
         
         # correct subscribeTimes testcase
         subTimes0 = self.subTimes("all_subscribe_res0.txt")
@@ -103,19 +118,18 @@ class TDTestCase:
 
         os.system("cat subscribe_res0.txt* > all_subscribe_res0.txt")
         subTimes0 = self.subTimes("all_subscribe_res0.txt")
-        print("pass")
         self.assertCheck("all_subscribe_res0.txt",subTimes0 ,202)
 
-        
-
-        # correct data testcase
-        os.system("kill -9 %d" % query_pid)
         sleep(3)
         os.system("rm -rf ./subscribe_res*")   
         os.system("rm -rf ./all_subscribe*")
         os.system("rm -rf ./*.py.sql")
+        os.system("rm -rf ./nohup*")
+        os.system("ps -aux |grep 'taosdemoAllTest/taosdemoTestSupportNanoSubscribe.json' |awk '{print $2}'|xargs kill -9 >/dev/null 2>&1")
+        os.system("ps -aux |grep 'tools/taosdemoAllTest/NanoTestCase/taosdemoTestSupportNanoSubscribe.json' |awk '{print $2}'|xargs kill -9 >/dev/null 2>&1")
+        os.system("ps -aux |grep 'tools/taosdemoAllTest/NanoTestCase/taosdemoTestNanoDatabaseInsertForSub.json' |awk '{print $2}'|xargs kill -9 >/dev/null 2>&1")
+        
   
-
          
     def stop(self):
         tdSql.close()
@@ -123,3 +137,4 @@ class TDTestCase:
 
 tdCases.addWindows(__file__, TDTestCase())
 tdCases.addLinux(__file__, TDTestCase())
+