Merge pull request #13708 from taosdata/fix/ZhiqiangWang/TD-16357-add-win32-full-case-test

test: add win32 full case test

tests/system-test/1-insert/influxdb_line_taosc_insert.py

@@ -23,6 +23,10 @@ from util.sql import *
 import threading
 from util.types import TDSmlProtocolType, TDSmlTimestampType
 from util.common import tdCom
+import platform
+import io
+if platform.system().lower() == 'windows':
+    sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf8') 
 
 class TDTestCase:
     def init(self, conn, logSql):

tests/system-test/1-insert/opentsdb_telnet_line_taosc_insert.py

@@ -22,6 +22,10 @@ from util.sql import *
 from util.common import tdCom
 from util.types import TDSmlProtocolType, TDSmlTimestampType
 import threading
+import platform
+import io
+if platform.system().lower() == 'windows':
+    sys.stdout = io.TextIOWrapper(sys.stdout.buffer,encoding='utf8') 
 
 class TDTestCase:
     def init(self, conn, logSql):

tests/system-test/fulltest.bat

 
-@REM python3 .\test.py -f 0-others\taosShell.py
-@REM python3 .\test.py -f 0-others\taosShellError.py
+python3 .\test.py -f 0-others\taosShell.py
+python3 .\test.py -f 0-others\taosShellError.py
 python3 .\test.py -f 0-others\taosShellNetChk.py
 python3 .\test.py -f 0-others\telemetry.py
 python3 .\test.py -f 0-others\taosdMonitor.py
 python3 .\test.py -f 0-others\udfTest.py
 python3 .\test.py -f 0-others\udf_create.py
 @REM python3 .\test.py -f 0-others\udf_restart_taosd.py
-@REM python3 .\test.py -f 0-others\cachelast.py
+python3 .\test.py -f 0-others\cachelast.py
 
-@REM python3 .\test.py -f 0-others\user_control.py
-@REM python3 .\test.py -f 0-others\fsync.py
+python3 .\test.py -f 0-others\user_control.py
+python3 .\test.py -f 0-others\fsync.py
 
-@REM python3 .\test.py -f 1-insert\influxdb_line_taosc_insert.py
-@REM python3 .\test.py -f 1-insert\opentsdb_telnet_line_taosc_insert.py
-@REM python3 .\test.py -f 1-insert\opentsdb_json_taosc_insert.py
+python3 .\test.py -f 1-insert\influxdb_line_taosc_insert.py
+python3 .\test.py -f 1-insert\opentsdb_telnet_line_taosc_insert.py
+python3 .\test.py -f 1-insert\opentsdb_json_taosc_insert.py
 @REM #python3 .\test.py -f 1-insert\test_stmt_muti_insert_query.py
-@REM python3 .\test.py -f 1-insert\alter_stable.py
-@REM python3 .\test.py -f 1-insert\alter_table.py
-@REM python3 .\test.py -f 2-query\between.py
-@REM python3 .\test.py -f 2-query\distinct.py
-@REM python3 .\test.py -f 2-query\varchar.py
+python3 .\test.py -f 1-insert\alter_stable.py
+python3 .\test.py -f 1-insert\alter_table.py
+python3 .\test.py -f 2-query\between.py
+python3 .\test.py -f 2-query\distinct.py
+python3 .\test.py -f 2-query\varchar.py
 @REM python3 .\test.py -f 2-query\ltrim.py
-@REM python3 .\test.py -f 2-query\rtrim.py
-@REM python3 .\test.py -f 2-query\length.py
-@REM python3 .\test.py -f 2-query\char_length.py
-@REM python3 .\test.py -f 2-query\upper.py
-@REM python3 .\test.py -f 2-query\lower.py
-@REM python3 .\test.py -f 2-query\join.py
-@REM python3 .\test.py -f 2-query\join2.py
-@REM python3 .\test.py -f 2-query\cast.py
-@REM python3 .\test.py -f 2-query\union.py
-@REM python3 .\test.py -f 2-query\union1.py
+python3 .\test.py -f 2-query\rtrim.py
+python3 .\test.py -f 2-query\length.py
+python3 .\test.py -f 2-query\char_length.py
+python3 .\test.py -f 2-query\upper.py
+python3 .\test.py -f 2-query\lower.py
+python3 .\test.py -f 2-query\join.py
+python3 .\test.py -f 2-query\join2.py
+python3 .\test.py -f 2-query\cast.py
+python3 .\test.py -f 2-query\union.py
+python3 .\test.py -f 2-query\union1.py
 @REM python3 .\test.py -f 2-query\concat.py
-@REM python3 .\test.py -f 2-query\concat2.py
-@REM python3 .\test.py -f 2-query\concat_ws.py
-@REM python3 .\test.py -f 2-query\concat_ws2.py
+python3 .\test.py -f 2-query\concat2.py
+python3 .\test.py -f 2-query\concat_ws.py
+python3 .\test.py -f 2-query\concat_ws2.py
 @REM python3 .\test.py -f 2-query\check_tsdb.py
 @REM python3 .\test.py -f 2-query\spread.py
 @REM python3 .\test.py -f 2-query\hyperloglog.py
 
+python3 .\test.py -f 2-query\timezone.py
+python3 .\test.py -f 2-query\Now.py
+python3 .\test.py -f 2-query\Today.py
+python3 .\test.py -f 2-query\max.py
+python3 .\test.py -f 2-query\min.py
+python3 .\test.py -f 2-query\count.py
+python3 .\test.py -f 2-query\last.py
+python3 .\test.py -f 2-query\first.py
+python3 .\test.py -f 2-query\To_iso8601.py
+python3 .\test.py -f 2-query\To_unixtimestamp.py
+python3 .\test.py -f 2-query\timetruncate.py
+python3 .\test.py -f 2-query\diff.py
+python3 .\test.py -f 2-query\Timediff.py
 
-@REM python3 .\test.py -f 2-query\timezone.py
-@REM python3 .\test.py -f 2-query\Now.py
-@REM python3 .\test.py -f 2-query\Today.py
-@REM python3 .\test.py -f 2-query\max.py
-@REM python3 .\test.py -f 2-query\min.py
-@REM python3 .\test.py -f 2-query\count.py
-@REM python3 .\test.py -f 2-query\last.py
-@REM python3 .\test.py -f 2-query\first.py
-@REM python3 .\test.py -f 2-query\To_iso8601.py
-@REM python3 .\test.py -f 2-query\To_unixtimestamp.py
-@REM python3 .\test.py -f 2-query\timetruncate.py
-@REM python3 .\test.py -f 2-query\diff.py
-@REM python3 .\test.py -f 2-query\Timediff.py
-
-@REM python3 .\test.py -f 2-query\top.py
-@REM python3 .\test.py -f 2-query\bottom.py
-@REM python3 .\test.py -f 2-query\percentile.py
-@REM python3 .\test.py -f 2-query\apercentile.py
-@REM python3 .\test.py -f 2-query\abs.py
-@REM python3 .\test.py -f 2-query\ceil.py
-@REM python3 .\test.py -f 2-query\floor.py
-@REM python3 .\test.py -f 2-query\round.py
-@REM python3 .\test.py -f 2-query\log.py
-@REM python3 .\test.py -f 2-query\pow.py
-@REM python3 .\test.py -f 2-query\sqrt.py
-@REM python3 .\test.py -f 2-query\sin.py
-@REM python3 .\test.py -f 2-query\cos.py
-@REM python3 .\test.py -f 2-query\tan.py
-@REM python3 .\test.py -f 2-query\arcsin.py
-@REM python3 .\test.py -f 2-query\arccos.py
-@REM python3 .\test.py -f 2-query\arctan.py
+python3 .\test.py -f 2-query\top.py
+python3 .\test.py -f 2-query\bottom.py
+python3 .\test.py -f 2-query\percentile.py
+python3 .\test.py -f 2-query\apercentile.py
+python3 .\test.py -f 2-query\abs.py
+python3 .\test.py -f 2-query\ceil.py
+python3 .\test.py -f 2-query\floor.py
+python3 .\test.py -f 2-query\round.py
+python3 .\test.py -f 2-query\log.py
+python3 .\test.py -f 2-query\pow.py
+python3 .\test.py -f 2-query\sqrt.py
+python3 .\test.py -f 2-query\sin.py
+python3 .\test.py -f 2-query\cos.py
+python3 .\test.py -f 2-query\tan.py
+python3 .\test.py -f 2-query\arcsin.py
+python3 .\test.py -f 2-query\arccos.py
+python3 .\test.py -f 2-query\arctan.py
 @REM python3 .\test.py -f 2-query\query_cols_tags_and_or.py
 @REM # python3 .\test.py -f 2-query\nestedQuery.py
 @REM # TD-15983 subquery output duplicate name column. 
 @REM # Please Xiangyang Guo modify the following script
 @REM # python3 .\test.py -f 2-query\nestedQuery_str.py
 
-@REM python3 .\test.py -f 2-query\avg.py
-@REM python3 .\test.py -f 2-query\elapsed.py
+python3 .\test.py -f 2-query\avg.py
+python3 .\test.py -f 2-query\elapsed.py
 @REM python3 .\test.py -f 2-query\csum.py
-@REM python3 .\test.py -f 2-query\mavg.py
-@REM python3 .\test.py -f 2-query\diff.py
-@REM python3 .\test.py -f 2-query\sample.py
+python3 .\test.py -f 2-query\mavg.py
+python3 .\test.py -f 2-query\diff.py
+python3 .\test.py -f 2-query\sample.py
 @REM python3 .\test.py -f 2-query\function_diff.py
-@REM python3 .\test.py -f 2-query\unique.py
-@REM python3 .\test.py -f 2-query\stateduration.py
-@REM python3 .\test.py -f 2-query\function_stateduration.py
-@REM python3 .\test.py -f 2-query\statecount.py
+python3 .\test.py -f 2-query\unique.py
+python3 .\test.py -f 2-query\stateduration.py
+python3 .\test.py -f 2-query\function_stateduration.py
+python3 .\test.py -f 2-query\statecount.py
 
 @REM python3 .\test.py -f 7-tmq\basic5.py
 @REM python3 .\test.py -f 7-tmq\subscribeDb.py
@@ -100,4 +99,4 @@ python3 .\test.py -f 0-others\udf_create.py
 @REM python3 .\test.py -f 7-tmq\subscribeStb2.py
 @REM python3 .\test.py -f 7-tmq\subscribeStb3.py
 @REM python3 .\test.py -f 7-tmq\subscribeStb4.py
-@REM python3 .\test.py -f 7-tmq\db.py
+@REM python3 .\test.py -f 7-tmq\db.py
\ No newline at end of file

tests/system-test/simpletest.bat

+
+@REM python3 .\test.py -f 0-others\taosShell.py
+@REM python3 .\test.py -f 0-others\taosShellError.py
+python3 .\test.py -f 0-others\taosShellNetChk.py
+python3 .\test.py -f 0-others\telemetry.py
+python3 .\test.py -f 0-others\taosdMonitor.py
+python3 .\test.py -f 0-others\udfTest.py
+python3 .\test.py -f 0-others\udf_create.py
+@REM python3 .\test.py -f 0-others\udf_restart_taosd.py
+@REM python3 .\test.py -f 0-others\cachelast.py
+
+@REM python3 .\test.py -f 0-others\user_control.py
+@REM python3 .\test.py -f 0-others\fsync.py
+
+@REM python3 .\test.py -f 1-insert\influxdb_line_taosc_insert.py
+@REM python3 .\test.py -f 1-insert\opentsdb_telnet_line_taosc_insert.py
+@REM python3 .\test.py -f 1-insert\opentsdb_json_taosc_insert.py
+@REM #python3 .\test.py -f 1-insert\test_stmt_muti_insert_query.py
+@REM python3 .\test.py -f 1-insert\alter_stable.py
+@REM python3 .\test.py -f 1-insert\alter_table.py
+@REM python3 .\test.py -f 2-query\between.py
+@REM python3 .\test.py -f 2-query\distinct.py
+@REM python3 .\test.py -f 2-query\varchar.py
+@REM python3 .\test.py -f 2-query\ltrim.py
+@REM python3 .\test.py -f 2-query\rtrim.py
+@REM python3 .\test.py -f 2-query\length.py
+@REM python3 .\test.py -f 2-query\char_length.py
+@REM python3 .\test.py -f 2-query\upper.py
+@REM python3 .\test.py -f 2-query\lower.py
+@REM python3 .\test.py -f 2-query\join.py
+@REM python3 .\test.py -f 2-query\join2.py
+@REM python3 .\test.py -f 2-query\cast.py
+@REM python3 .\test.py -f 2-query\union.py
+@REM python3 .\test.py -f 2-query\union1.py
+@REM python3 .\test.py -f 2-query\concat.py
+@REM python3 .\test.py -f 2-query\concat2.py
+@REM python3 .\test.py -f 2-query\concat_ws.py
+@REM python3 .\test.py -f 2-query\concat_ws2.py
+@REM python3 .\test.py -f 2-query\check_tsdb.py
+@REM python3 .\test.py -f 2-query\spread.py
+@REM python3 .\test.py -f 2-query\hyperloglog.py
+
+
+@REM python3 .\test.py -f 2-query\timezone.py
+@REM python3 .\test.py -f 2-query\Now.py
+@REM python3 .\test.py -f 2-query\Today.py
+@REM python3 .\test.py -f 2-query\max.py
+@REM python3 .\test.py -f 2-query\min.py
+@REM python3 .\test.py -f 2-query\count.py
+@REM python3 .\test.py -f 2-query\last.py
+@REM python3 .\test.py -f 2-query\first.py
+@REM python3 .\test.py -f 2-query\To_iso8601.py
+@REM python3 .\test.py -f 2-query\To_unixtimestamp.py
+@REM python3 .\test.py -f 2-query\timetruncate.py
+@REM python3 .\test.py -f 2-query\diff.py
+@REM python3 .\test.py -f 2-query\Timediff.py
+
+@REM python3 .\test.py -f 2-query\top.py
+@REM python3 .\test.py -f 2-query\bottom.py
+@REM python3 .\test.py -f 2-query\percentile.py
+@REM python3 .\test.py -f 2-query\apercentile.py
+@REM python3 .\test.py -f 2-query\abs.py
+@REM python3 .\test.py -f 2-query\ceil.py
+@REM python3 .\test.py -f 2-query\floor.py
+@REM python3 .\test.py -f 2-query\round.py
+@REM python3 .\test.py -f 2-query\log.py
+@REM python3 .\test.py -f 2-query\pow.py
+@REM python3 .\test.py -f 2-query\sqrt.py
+@REM python3 .\test.py -f 2-query\sin.py
+@REM python3 .\test.py -f 2-query\cos.py
+@REM python3 .\test.py -f 2-query\tan.py
+@REM python3 .\test.py -f 2-query\arcsin.py
+@REM python3 .\test.py -f 2-query\arccos.py
+@REM python3 .\test.py -f 2-query\arctan.py
+@REM python3 .\test.py -f 2-query\query_cols_tags_and_or.py
+@REM # python3 .\test.py -f 2-query\nestedQuery.py
+@REM # TD-15983 subquery output duplicate name column. 
+@REM # Please Xiangyang Guo modify the following script
+@REM # python3 .\test.py -f 2-query\nestedQuery_str.py
+
+@REM python3 .\test.py -f 2-query\avg.py
+@REM python3 .\test.py -f 2-query\elapsed.py
+@REM python3 .\test.py -f 2-query\csum.py
+@REM python3 .\test.py -f 2-query\mavg.py
+@REM python3 .\test.py -f 2-query\diff.py
+@REM python3 .\test.py -f 2-query\sample.py
+@REM python3 .\test.py -f 2-query\function_diff.py
+@REM python3 .\test.py -f 2-query\unique.py
+@REM python3 .\test.py -f 2-query\stateduration.py
+@REM python3 .\test.py -f 2-query\function_stateduration.py
+@REM python3 .\test.py -f 2-query\statecount.py
+
+@REM python3 .\test.py -f 7-tmq\basic5.py
+@REM python3 .\test.py -f 7-tmq\subscribeDb.py
+@REM python3 .\test.py -f 7-tmq\subscribeDb0.py
+@REM python3 .\test.py -f 7-tmq\subscribeDb1.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb0.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb1.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb2.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb3.py
+@REM python3 .\test.py -f 7-tmq\subscribeStb4.py
+@REM python3 .\test.py -f 7-tmq\db.py

tests/system-test/test-all.bat

@@ -2,26 +2,42 @@
 SETLOCAL EnableDelayedExpansion
 for /F "tokens=1,2 delims=#" %%a in ('"prompt #$H#$E# & echo on & for %%b in (1) do     rem"') do (  set "DEL=%%a")
 set /a a=0
+if %1 == full (
+    echo Windows Taosd Full Test
+    set /a exitNum=0
+    for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
+        for /f "tokens=1* delims= " %%a in ("%%i") do if not "%%a" == "@REM" (
+            set /a a+=1
+            echo !a! Processing %%i
+            call :GetTimeSeconds !time!
+            set time1=!_timeTemp!
+            echo Start at !time!
+            call %%i ARG1 > result_!a!.txt 2>error_!a!.txt
+            if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && set /a exitNum=8 ) else ( call :colorEcho 0a "Success" &echo. ) 
+        )
+    )
+    exit !exitNum!
+)
 echo Windows Taosd Test
-for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
+for /F "usebackq tokens=*" %%i in (simpletest.bat) do (
     for /f "tokens=1* delims= " %%a in ("%%i") do if not "%%a" == "@REM" (
-        echo Processing %%i
-        call :GetTimeSeconds %time%
-        set time1=!_timeTemp!
-        echo Start at %time%
         set /a a+=1
+        echo !a! Processing %%i
+        call :GetTimeSeconds !time!
+        set time1=!_timeTemp!
+        echo Start at !time!
         call %%i ARG1 > result_!a!.txt 2>error_!a!.txt
         if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && echo result: && cat result_!a!.txt && echo error: && cat error_!a!.txt && exit 8 ) else ( call :colorEcho 0a "Success" &echo. ) 
     )
 )
 @REM echo Linux Taosd Test
-@REM for /F "usebackq tokens=*" %%i in (fulltest.bat) do (
+@REM for /F "usebackq tokens=*" %%i in (simpletest.bat) do (
 @REM     for /f "tokens=1* delims= " %%a in ("%%i") do if not "%%a" == "@REM" (
-@REM         echo Processing %%i
-@REM         call :GetTimeSeconds %time%
-@REM         set time1=!_timeTemp!
-@REM         echo Start at %time%
 @REM         set /a a+=1
+@REM         echo !a! Processing %%i
+@REM         call :GetTimeSeconds !time!
+@REM         set time1=!_timeTemp!
+@REM         echo Start at !time!
 @REM         call %%i ARG1 -m %1 > result_!a!.txt 2>error_!a!.txt
 @REM         if errorlevel 1 ( call :colorEcho 0c "failed" &echo. && echo result: && cat result_!a!.txt && echo error: && cat error_!a!.txt && exit 8 ) else ( call :colorEcho 0a "Success" &echo. ) 
 @REM     )
@@ -57,5 +73,5 @@ for %%a in (%tt%) do (
     )
    set /a index=index+1
 )
-set /a _timeTemp=(%hh%*60+%mm%)*60+%ss%
+set /a _timeTemp=(%hh%*60+%mm%)*60+%ss%  || echo hh:%hh% mm:%mm% ss:%ss%
 goto :eof
\ No newline at end of file