fix test.py to support steven's case

tests/pytest/smoketest.sh

@@ -34,12 +34,12 @@ python3 ./test.py $1 -f table/db_table.py
 python3 ./test.py -s $1
 sleep 1
 
-python3 ./test.py $1 -f import_merge/importDataLastTO.py 
-python3 ./test.py -s $1
-sleep 1
-python3 ./test.py $1 -f import_merge/importDataLastT.py 
-python3 ./test.py -s $1
-sleep 1
+#python3 ./test.py $1 -f import_merge/importDataLastTO.py 
+#python3 ./test.py -s $1
+#sleep 1
+#python3 ./test.py $1 -f import_merge/importDataLastT.py 
+#python3 ./test.py -s $1
+#sleep 1
 python3 ./test.py $1 -f import_merge/importDataTO.py 
 python3 ./test.py -s $1
 sleep 1

tests/pytest/test.py

@@ -83,11 +83,21 @@ if __name__ == "__main__":
 
         tdLog.exit('stop All dnodes')
 
-    if masterIp == "":
     tdDnodes.init(deployPath)
     tdDnodes.setTestCluster(testCluster)
     tdDnodes.setValgrind(valgrind)
 
+    tdDnodes.stopAll()
+    tdDnodes.deploy(1)
+    tdDnodes.start(1)
+
+    if masterIp == "":
+        host='127.0.0.1'
+    else:
+        host=masterIp
+
+    tdLog.notice("Procedures for tdengine deployed in %s" % (host))
+
     if testCluster:
         tdLog.notice("Procedures for testing cluster")
         if fileName == "all":
@@ -96,23 +106,12 @@ if __name__ == "__main__":
             tdCases.runOneCluster(fileName)
     else:
         tdLog.notice("Procedures for testing self-deployment")
-            tdDnodes.stopAll()
-            tdDnodes.deploy(1)
-            tdDnodes.start(1)
         conn = taos.connect(
-                host='127.0.0.1',
+                host,
                 config=tdDnodes.getSimCfgPath())
         if fileName == "all":
             tdCases.runAllLinux(conn)
         else:
             tdCases.runOneLinux(conn, fileName)
-            conn.close()
-    else:
-        tdLog.notice("Procedures for tdengine deployed in %s" % (masterIp))
-        cfgPath = "../../build/test/cfg"   # was: tdDnodes.getSimCfgPath()
-        conn = taos.connect(host=masterIp, config=cfgPath)
-        if fileName == "all":
-            tdCases.runAllWindows(conn)
-        else:
-            tdCases.runOneWindows(conn, fileName)
+
     conn.close()