Test framework support windows

test/cases/05-VirtualTables/test_vtable_join.py

@@ -11,6 +11,7 @@
 
 # -*- coding: utf-8 -*-
 from new_test_framework.utils import tdLog, tdSql, etool, tdCom
+import os
 
 class TestVtableJoin:
 
@@ -57,15 +58,15 @@ def setup_class(cls):
             tdSql.execute(f"CREATE TABLE `vtb_org_normal_{i}` (ts timestamp, u_tinyint_col tinyint unsigned, u_smallint_col smallint unsigned, u_int_col int unsigned, u_bigint_col bigint unsigned, tinyint_col tinyint, smallint_col smallint, int_col int, bigint_col bigint, float_col float, double_col double, bool_col bool, binary_16_col binary(16), binary_32_col binary(32), nchar_16_col nchar(16), nchar_32_col nchar(32))")
 
         tdLog.info(f"insert data into org tables.")
-        datafile = etool.curFile(__file__, "data/data1.csv")
+        datafile = etool.getFilePath(__file__, "data", "data1.csv")
         tdSql.execute("insert into vtb_org_normal_0 file '%s';" % datafile)
         tdSql.execute("insert into vtb_org_child_0 file '%s';" % datafile)
 
-        datafile = etool.curFile(__file__, "data/data2.csv")
+        datafile = etool.getFilePath(__file__, "data", "data2.csv")
         tdSql.execute("insert into vtb_org_normal_1 file '%s';" % datafile)
         tdSql.execute("insert into vtb_org_child_1 file '%s';" % datafile)
 
-        datafile = etool.curFile(__file__, "data/data3.csv")
+        datafile = etool.getFilePath(__file__, "data", "data3.csv")
         tdSql.execute("insert into vtb_org_normal_2 file '%s';" % datafile)
         tdSql.execute("insert into vtb_org_child_2 file '%s';" % datafile)
 

test/cases/05-VirtualTables/test_vtable_meta.py

@@ -11,6 +11,7 @@
 
 # -*- coding: utf-8 -*-
 from new_test_framework.utils import tdLog, tdSql, etool, tdCom
+import os
 
 
 class TestVtableMeta:
@@ -147,8 +148,8 @@ def test_normal_query_new(self):
         # read sql from .sql file and execute
         tdLog.info("test normal query.")
         testCase = "test_vtable_meta"
-        self.sqlFile = etool.curFile(__file__, f"in/{testCase}.in")
-        self.ansFile = etool.curFile(__file__, f"ans/{testCase}.ans")
+        self.sqlFile = os.path.join(os.path.dirname(__file__), "in", f"{testCase}.in")
+        self.ansFile = os.path.join(os.path.dirname(__file__), "ans", f"{testCase}.ans")
 
         tdCom.compare_testcase_result(self.sqlFile, self.ansFile, testCase)
 

test/cases/05-VirtualTables/test_vtable_query.py

@@ -11,7 +11,7 @@
 
 # -*- coding: utf-8 -*-
 from new_test_framework.utils import tdLog, tdSql, etool, tdCom
-import time
+import os
 
 class TestVTableQuery:
 
@@ -58,15 +58,15 @@ def setup_class(cls):
             tdSql.execute(f"CREATE TABLE `vtb_org_normal_{i}` (ts timestamp, u_tinyint_col tinyint unsigned, u_smallint_col smallint unsigned, u_int_col int unsigned, u_bigint_col bigint unsigned, tinyint_col tinyint, smallint_col smallint, int_col int, bigint_col bigint, float_col float, double_col double, bool_col bool, binary_16_col binary(16), binary_32_col binary(32), nchar_16_col nchar(16), nchar_32_col nchar(32)) SMA(u_tinyint_col)")
 
         tdLog.info(f"insert data into org tables.")
-        datafile = etool.curFile(__file__, "data/data1.csv")
+        datafile = etool.getFilePath(__file__, "data", "data1.csv")
         tdSql.execute("insert into vtb_org_normal_0 file '%s';" % datafile)
         tdSql.execute("insert into vtb_org_child_0 file '%s';" % datafile)
 
-        datafile = etool.curFile(__file__, "data/data2.csv")
+        datafile = etool.getFilePath(__file__, "data", "data2.csv")
         tdSql.execute("insert into vtb_org_normal_1 file '%s';" % datafile)
         tdSql.execute("insert into vtb_org_child_1 file '%s';" % datafile)
 
-        datafile = etool.curFile(__file__, "data/data3.csv")
+        datafile = etool.getFilePath(__file__, "data", "data3.csv")
         tdSql.execute("insert into vtb_org_normal_2 file '%s';" % datafile)
         tdSql.execute("insert into vtb_org_child_2 file '%s';" % datafile)
 
@@ -208,8 +208,8 @@ def setup_class(cls):
     def run_normal_query(self, testCase):
         # read sql from .sql file and execute
         tdLog.info(f"test case : {testCase}.")
-        self.sqlFile = etool.curFile(__file__, f"in/{testCase}.in")
-        self.ansFile = etool.curFile(__file__, f"ans/{testCase}.ans")
+        self.sqlFile = os.path.join(os.path.dirname(__file__), "in", f"{testCase}.in")
+        self.ansFile = os.path.join(os.path.dirname(__file__), "ans", f"{testCase}.ans")
 
         tdCom.compare_testcase_result(self.sqlFile, self.ansFile, testCase)
 

test/cases/05-VirtualTables/test_vtable_query_after_alter.py

@@ -11,6 +11,7 @@
 
 # -*- coding: utf-8 -*-
 from new_test_framework.utils import tdLog, tdSql, etool, tdCom, sleep
+import os
 
 
 class TestVtableQueryAfterAlter:
@@ -58,15 +59,15 @@ def setup_class(cls):
             tdSql.execute(f"CREATE TABLE `vtb_org_normal_{i}` (ts timestamp, u_tinyint_col tinyint unsigned, u_smallint_col smallint unsigned, u_int_col int unsigned, u_bigint_col bigint unsigned, tinyint_col tinyint, smallint_col smallint, int_col int, bigint_col bigint, float_col float, double_col double, bool_col bool, binary_16_col binary(16), binary_32_col binary(32), nchar_16_col nchar(16), nchar_32_col nchar(32)) SMA(u_tinyint_col)")
 
         tdLog.info(f"insert data into org tables.")
-        datafile = etool.curFile(__file__, "data/data1.csv")
+        datafile = etool.getFilePath(__file__, "data", "data1.csv")
         tdSql.execute("insert into vtb_org_normal_0 file '%s';" % datafile)
         tdSql.execute("insert into vtb_org_child_0 file '%s';" % datafile)
 
-        datafile = etool.curFile(__file__, "data/data2.csv")
+        datafile = etool.getFilePath(__file__, "data", "data2.csv")
         tdSql.execute("insert into vtb_org_normal_1 file '%s';" % datafile)
         tdSql.execute("insert into vtb_org_child_1 file '%s';" % datafile)
 
-        datafile = etool.curFile(__file__, "data/data3.csv")
+        datafile = etool.getFilePath(__file__, "data", "data3.csv")
         tdSql.execute("insert into vtb_org_normal_2 file '%s';" % datafile)
         tdSql.execute("insert into vtb_org_child_2 file '%s';" % datafile)
 

test/cases/05-VirtualTables/test_vtable_query_cross_db.py

@@ -11,6 +11,7 @@
 
 # -*- coding: utf-8 -*-
 from new_test_framework.utils import tdLog, tdSql, etool, tdCom
+import os
 
 
 class TestVtableQueryCrossDB:
@@ -59,15 +60,15 @@ def setup_class(cls):
                 tdSql.execute(f"CREATE TABLE `vtb_org_normal_{j}` (ts timestamp, u_tinyint_col tinyint unsigned, u_smallint_col smallint unsigned, u_int_col int unsigned, u_bigint_col bigint unsigned, tinyint_col tinyint, smallint_col smallint, int_col int, bigint_col bigint, float_col float, double_col double, bool_col bool, binary_16_col binary(16), binary_32_col binary(32), nchar_16_col nchar(16), nchar_32_col nchar(32)) SMA(u_tinyint_col)")
 
             tdLog.info(f"insert data into org tables.")
-            datafile = etool.curFile(__file__, "data/data1.csv")
+            datafile = etool.getFilePath(__file__, "data", "data1.csv")
             tdSql.execute("insert into vtb_org_normal_0 file '%s';" % datafile)
             tdSql.execute("insert into vtb_org_child_0 file '%s';" % datafile)
 
-            datafile = etool.curFile(__file__, "data/data2.csv")
+            datafile = etool.getFilePath(__file__, "data", "data2.csv")
             tdSql.execute("insert into vtb_org_normal_1 file '%s';" % datafile)
             tdSql.execute("insert into vtb_org_child_1 file '%s';" % datafile)
 
-            datafile = etool.curFile(__file__, "data/data3.csv")
+            datafile = etool.getFilePath(__file__, "data", "data3.csv")
             tdSql.execute("insert into vtb_org_normal_2 file '%s';" % datafile)
             tdSql.execute("insert into vtb_org_child_2 file '%s';" % datafile)
 
@@ -213,8 +214,8 @@ def setup_class(cls):
     def run_normal_query(self, testCase):
         # read sql from .sql file and execute
         tdLog.info(f"test case : {testCase}.")
-        self.sqlFile = etool.curFile(__file__, f"in/{testCase}.in")
-        self.ansFile = etool.curFile(__file__, f"ans/{testCase}.ans")
+        self.sqlFile = os.path.join(os.path.dirname(__file__), "in", f"{testCase}.in")
+        self.ansFile = os.path.join(os.path.dirname(__file__), "ans", f"{testCase}.ans")
 
         tdCom.compare_testcase_result(self.sqlFile, self.ansFile, testCase)
 

test/cases/06-DataIngestion/02-Import/data.sql

@@ -0,0 +1,3 @@
+2020-1-1 1:1:1,abc,device,123,9876,abc,net,mno,province,city,al
+2020-1-2 1:1:1,abc,device,123,9876,abc,net,mno,province,city,al
+2020-1-3 1:1:1,abc,device,123,9876,abc,net,mno,province,city,al

test/cases/20-DataQuerying/09-Having/test_having_bugfix.py

@@ -225,4 +225,4 @@ def test_td32059(self):
             "SELECT _wstart, last_row(id) FROM stb WHERE ts BETWEEN '2024-09-11 09:50:13.999' AND '2024-09-11 09:59:13.999' INTERVAL(30s) FILL(PREV) HAVING(last_row(id) IS NOT NULL);"
         )
         tdSql.checkRows(13)
-        tdSql.checkAssert("NULL" not in [item[1] for item in tdSql.queryResult])
+        tdSql.checkAssert("NULL" not in [item[1] for item in tdSql.queryResult])

test/cases/23-Users/test_user_privilege_sysinfo.py

@@ -1,4 +1,5 @@
 import time
+import platform
 from new_test_framework.utils import tdLog, tdSql, sc, clusterComCheck, clusterComCheck
 
 
@@ -51,7 +52,8 @@ def test_user_privilege_sysinfo(self):
 
         tdLog.info(f"=============== check oper")
         tdSql.error(f"create user u1 pass 'u1'")
-        tdSql.query(f"show anodes;")
+        if platform.system() != "Windows":
+            tdSql.query(f"show anodes;")
         tdSql.query(f"show d2.disk_info;")
         tdSql.query(
             f"select * from INFORMATION_SCHEMA.INS_DISK_USAGE where db_name = 'db'"

test/cases/41-StreamProcessing/20-UseCase/test_idmp_meters.py

@@ -1,6 +1,7 @@
 import time
 import math
 import random
+import os
 from new_test_framework.utils import tdLog, tdSql, tdStream, etool, sc
 from datetime import datetime
 from datetime import date
@@ -98,7 +99,7 @@ def prepare(self):
         self.start2 = 1752574200000
 
         # import data
-        etool.taosdump(f"-i cases/13-StreamProcessing/20-UseCase/meters_data/data/")
+        etool.taosdump(f"-i {os.path.join(os.path.dirname(__file__), 'meters_data', 'data')}")
 
         tdLog.info(f"import data to db={self.db} successfully.")
 

test/cases/41-StreamProcessing/20-UseCase/test_idmp_meters_td36808.py

@@ -1,6 +1,7 @@
 import time
 import math
 import random
+import os
 from new_test_framework.utils import tdLog, tdSql, tdStream, etool
 from datetime import datetime
 from datetime import date
@@ -59,7 +60,7 @@ def prepare(self):
         self.vdb = "tdasset"
         self.stb = "electricity_meters"
         # import data
-        etool.taosdump(f"-i cases/13-StreamProcessing/20-UseCase/meters_data/data/")
+        etool.taosdump(f"-i {os.path.join(os.path.dirname(__file__), 'meters_data', 'data')}")
 
         tdLog.info(f"import data to db={self.db} successfully.")
 

test/cases/41-StreamProcessing/20-UseCase/test_idmp_pv.py

@@ -1,5 +1,5 @@
 from test_idmp_tobacco import IdmpScene
-
+import os
 
 class TestIdmpPhotovoltaic:
     def test_pv(self):
@@ -36,10 +36,10 @@ def test_pv(self):
             "photovoltaic",
             "idmp_sample_pv",
             "idmp",
-            "cases/13-StreamProcessing/20-UseCase/pv_data/idmp_sample_pv",
-            "cases/13-StreamProcessing/20-UseCase/pv_data/idmp/vstb.sql",
-            "cases/13-StreamProcessing/20-UseCase/pv_data/idmp/vtb.sql",
-            "cases/13-StreamProcessing/20-UseCase/pv_data/idmp/stream.json",
+            os.path.join(os.path.dirname(__file__), 'pv_data', 'idmp_sample_pv'),
+            os.path.join(os.path.dirname(__file__), 'pv_data', 'idmp', 'vstb.sql'),
+            os.path.join(os.path.dirname(__file__), 'pv_data', 'idmp', 'vtb.sql'),
+            os.path.join(os.path.dirname(__file__), 'pv_data', 'idmp', 'stream.json'),
         )
         # pv.stream_ids = [1, 2, 3, 4, 5, 6, 7]
         pv.run()

test/cases/41-StreamProcessing/20-UseCase/test_idmp_tobacco.py

@@ -47,10 +47,10 @@ def test_idmp_tobacco(self):
             "tobacco",
             "idmp_sample_tobacco",
             "idmp",
-            "cases/13-StreamProcessing/20-UseCase/tobacco_data/idmp_sample_tobacco",
-            "cases/13-StreamProcessing/20-UseCase/tobacco_data/idmp/vstb.sql",
-            "cases/13-StreamProcessing/20-UseCase/tobacco_data/idmp/vtb.sql",
-            "cases/13-StreamProcessing/20-UseCase/tobacco_data/idmp/stream.json",
+            os.path.join(os.path.dirname(__file__), 'tobacco_data', 'idmp_sample_tobacco'),
+            os.path.join(os.path.dirname(__file__), 'tobacco_data', 'idmp', 'vstb.sql'),
+            os.path.join(os.path.dirname(__file__), 'tobacco_data', 'idmp', 'vtb.sql'),
+            os.path.join(os.path.dirname(__file__), 'tobacco_data', 'idmp', 'stream.json'),
         )
         # 这里可以指定需要创建的 stream_ids
         tobac.stream_ids = [1, 2, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13]

test/cases/41-StreamProcessing/20-UseCase/test_idmp_vehicle.py

@@ -1,6 +1,7 @@
 import time
 import math
 import random
+import os
 from new_test_framework.utils import tdLog, tdSql, tdStream, etool, sc
 from datetime import datetime
 from datetime import date
@@ -93,7 +94,7 @@ def prepare(self):
 
 
         # import data
-        etool.taosdump(f"-i cases/13-StreamProcessing/20-UseCase/vehicle_data/")
+        etool.taosdump(f"-i {os.path.join(os.path.dirname(__file__), 'vehicle_data')}")
 
         tdLog.info(f"import data to db={self.db}. successfully.")
 

test/cases/uncatalog/army/cluster/test_snapshot.py

@@ -16,9 +16,6 @@
 import random
 
 
-
-
-
 class TestSnapshot:
     updatecfgDict = {
         "countAlwaysReturnValue" : "1",

test/cases/uncatalog/army/cluster/test_strong_password.py

@@ -54,7 +54,7 @@ def test_strong_password(self):
 
         tdSql.execute("create user test2 pass '123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345' sysinfo 0;")
 
-        cmd = "taos -u test2 -p123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345 -s 'show databases;'"
+        cmd = 'taos -u test2 -p123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345 -s "show databases;"'
         if os.system(cmd) != 0:
             raise Exception("failed to execute system command. cmd: %s" % cmd)
 

test/cases/uncatalog/army/cluster/test_tsdb_snapshot.py

@@ -18,6 +18,8 @@
 import shutil
 import subprocess
 from datetime import datetime, timedelta
+import platform
+import json
 
 
 class TestTsdbSnapshot:
@@ -114,9 +116,15 @@ def _write_bulk_data(self):
     ]
 }}
 """
-        json_file = '/tmp/test.json'
-        with open(json_file, 'w') as f:
-            f.write(json_content)
+        if platform.system().lower() == "windows":
+            json_file = os.path.abspath("test.json")
+            safe_json_content = json_content.replace("\\", "\\\\")
+            with open(json_file, 'w', encoding='utf-8') as f:
+                json.dump(json.loads(safe_json_content), f, ensure_ascii=False, indent=2)
+        else:
+            json_file = '/tmp/test.json'
+            with open(json_file, 'w') as f:
+                f.write(json_content)
         # Use subprocess.run() to wait for the command to finish
         subprocess.run(f'taosBenchmark -f {json_file}', shell=True, check=True)
 
@@ -203,9 +211,15 @@ def _write_bulk_data2(self):
     ]
 }}
 """
-        json_file = '/tmp/test.json'
-        with open(json_file, 'w') as f:
-            f.write(json_content)
+        if platform.system().lower() == "windows":
+            json_file = os.path.abspath("test.json")
+            safe_json_content = json_content.replace("\\", "\\\\")
+            with open(json_file, 'w', encoding='utf-8') as f:
+                json.dump(json.loads(safe_json_content), f, ensure_ascii=False, indent=2)
+        else:
+            json_file = '/tmp/test.json'
+            with open(json_file, 'w') as f:
+                f.write(json_content)
         # Use subprocess.run() to wait for the command to finish
         subprocess.run(f'taosBenchmark -f {json_file}', shell=True, check=True)