From 46a7c3c91291086bb5048797d8bfdd67b9886000 Mon Sep 17 00:00:00 2001
From: Shuduo Sang <sangshuduo@gmail.com>
Date: Fri, 24 Apr 2020 23:54:39 +0800
Subject: [PATCH] add insert/int.py and insert/float.py to test insert
 function.

[TD-167]
---
 tests/pytest/simpletest.sh  |  6 ++++++
 tests/pytest/test.py        |  7 +++++--
 tests/pytest/util/cases.py  |  8 ++++++--
 tests/pytest/util/dnodes.py | 32 +++++++++++++++++++++-----------
 tests/pytest/util/sql.py    |  2 +-
 5 files changed, 39 insertions(+), 16 deletions(-)

diff --git a/tests/pytest/simpletest.sh b/tests/pytest/simpletest.sh
index b77c1aa142..58345e13ee 100755
--- a/tests/pytest/simpletest.sh
+++ b/tests/pytest/simpletest.sh
@@ -1,3 +1,9 @@
 #!/bin/bash
 python3 ./test.py -f insert/basic.py $1
 python3 ./test.py -s $1
+sleep 1
+python3 ./test.py -f insert/int.py $1
+python3 ./test.py -s $1
+sleep 1
+python3 ./test.py -f insert/float.py $1
+python3 ./test.py -s $1
diff --git a/tests/pytest/test.py b/tests/pytest/test.py
index 55ec46e526..ae82ed045c 100644
--- a/tests/pytest/test.py
+++ b/tests/pytest/test.py
@@ -100,12 +100,15 @@ if __name__ == "__main__":
             tdDnodes.deploy(1)
             tdDnodes.start(1)
             conn = taos.connect(
-                host='192.168.0.1',
+                host='127.0.0.1',
                 config=tdDnodes.getSimCfgPath())
             if fileName == "all":
                 tdCases.runAllLinux(conn)
             else:
-                tdCases.runOneLinux(conn, fileName)
+                try:
+                    tdCases.runOneLinux(conn, fileName)
+                except Exception as e:
+                    tdLog.exit("failed: %s" % fileName)
             conn.close()
     else:
         tdLog.notice("Procedures for tdengine deployed in %s" % (masterIp))
diff --git a/tests/pytest/util/cases.py b/tests/pytest/util/cases.py
index 4bd1b1e9d1..dd1f9e1649 100644
--- a/tests/pytest/util/cases.py
+++ b/tests/pytest/util/cases.py
@@ -67,12 +67,16 @@ class TDCases:
             if tmp.name.find(fileName) != -1:
                 case = testModule.TDTestCase()
                 case.init(conn)
-                case.run()
+                try:
+                    case.run()
+                except Exception as e:
+                    tdLog.notice(repr(e))
+                    tdLog.exit("failed: %s" % fileName)
                 case.stop()
                 runNum += 1
                 continue
 
-        tdLog.notice("total %d Linux test case(s) executed" % (runNum))
+        tdLog.success("total %d Linux test case(s) executed" % (runNum))
 
     def runAllWindows(self, conn):
         # TODO: load all Windows cases here
diff --git a/tests/pytest/util/dnodes.py b/tests/pytest/util/dnodes.py
index 6a9c2607e6..51eed3d25a 100644
--- a/tests/pytest/util/dnodes.py
+++ b/tests/pytest/util/dnodes.py
@@ -19,12 +19,19 @@ from util.log import *
 
 
 class TDSimClient:
+    def __init__(self):
+        self.testCluster = False
+
     def init(self, path):
+        self.__init__()
         self.path = path
 
     def getCfgDir(self):
         return self.cfgDir
 
+    def setTestCluster(self, value):
+        self.testCluster = value
+
     def cfg(self, option, value):
         cmd = "echo '%s %s' >> %s" % (option, value, self.cfgPath)
         if os.system(cmd) != 0:
@@ -55,8 +62,9 @@ class TDSimClient:
         if os.system(cmd) != 0:
             tdLog.exit(cmd)
 
-        self.cfg("masterIp", "192.168.0.1")
-        self.cfg("secondIp", "192.168.0.2")
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
         self.cfg("logDir", self.logDir)
         self.cfg("numOfLogLines", "100000000")
         self.cfg("numOfThreadsPerCore", "2.0")
@@ -128,11 +136,12 @@ class TDDnode:
         if self.testCluster:
             self.startIP()
 
-        self.cfg("masterIp", "192.168.0.1")
-        self.cfg("secondIp", "192.168.0.2")
-        self.cfg("publicIp", "192.168.0.%d" % (self.index))
-        self.cfg("internalIp", "192.168.0.%d" % (self.index))
-        self.cfg("privateIp", "192.168.0.%d" % (self.index))
+        if self.testCluster:
+            self.cfg("masterIp", "192.168.0.1")
+            self.cfg("secondIp", "192.168.0.2")
+            self.cfg("publicIp", "192.168.0.%d" % (self.index))
+            self.cfg("internalIp", "192.168.0.%d" % (self.index))
+            self.cfg("privateIp", "192.168.0.%d" % (self.index))
         self.cfg("dataDir", self.dataDir)
         self.cfg("logDir", self.logDir)
         self.cfg("numOfLogLines", "100000000")
@@ -291,10 +300,6 @@ class TDDnodes:
         for i in range(len(self.dnodes)):
             self.dnodes[i].init(self.path)
 
-        self.sim = TDSimClient()
-        self.sim.init(self.path)
-        self.sim.deploy()
-
     def setTestCluster(self, value):
         self.testCluster = value
 
@@ -302,6 +307,11 @@ class TDDnodes:
         self.valgrind = value
 
     def deploy(self, index):
+        self.sim = TDSimClient()
+        self.sim.init(self.path)
+        self.sim.setTestCluster(self.testCluster)
+        self.sim.deploy()
+
         self.check(index)
         self.dnodes[index - 1].setTestCluster(self.testCluster)
         self.dnodes[index - 1].setValgrind(self.valgrind)
diff --git a/tests/pytest/util/sql.py b/tests/pytest/util/sql.py
index b4ac845bc8..0008468130 100644
--- a/tests/pytest/util/sql.py
+++ b/tests/pytest/util/sql.py
@@ -63,7 +63,7 @@ class TDSql:
     def checkRows(self, expectRows):
         if self.queryRows != expectRows:
             tdLog.exit(
-                "sql:%.40s, queryRows:%d != expect:%d" %
+                "failed: sql:%.40s, queryRows:%d != expect:%d" %
                 (self.sql, self.queryRows, expectRows))
         tdLog.info("sql:%.40s, queryRows:%d == expect:%d" %
                    (self.sql, self.queryRows, expectRows))
-- 
GitLab