Merge pull request #3520 from taosdata/xiaoping/add_test_case

fix test failures

tests/pytest/import_merge/importToCommit.py

@@ -33,7 +33,7 @@ class TDTestCase:
         tdDnodes.start(1)
         tdSql.execute('reset query cache')
         tdSql.execute('drop database if exists db')
-        tdSql.execute('create database db cache 128 maxtables 10')
+        tdSql.execute('create database db cache 128')
         tdSql.execute('use db')
 
         tdLog.info("================= step1")

tests/pytest/tag_lite/datatype-without-alter.py

@@ -38,7 +38,7 @@ class TDTestCase:
         tdLog.info("drop database db if exits")
         tdSql.execute('drop database if exists db')
         tdLog.info("================= step1")
-        tdSql.execute('create database db maxtables 4')
+        tdSql.execute('create database db')
         tdLog.sleep(5)
         tdSql.execute('use db')
 

tests/pytest/tag_lite/datatype.py

@@ -38,7 +38,7 @@ class TDTestCase:
         tdLog.info("drop database db if exits")
         tdSql.execute('drop database if exists db')
         tdLog.info("================= step1")
-        tdSql.execute('create database db maxtables 4')
+        tdSql.execute('create database db')
         tdLog.sleep(5)
         tdSql.execute('use db')
 

tests/pytest/util/sql.py

@@ -123,8 +123,12 @@ class TDSql:
 
     def checkData(self, row, col, data):
         self.checkRowCol(row, col) 
-        if str(self.queryResult[row][col]) != str(data): 
-            if isinstance(data, float) and abs(self.queryResult[row][col] - data) <= 0.000001:                
+        if self.queryResult[row][col] != data:
+            if str(self.queryResult[row][col]) != str(data):
+                tdLog.info("sql:%s, row:%d col:%d data:%s == expect:%s" %
+                            (self.sql, row, col, self.queryResult[row][col], data)) 
+                return
+            elif isinstance(data, float) and abs(self.queryResult[row][col] - data) <= 0.000001:                
                 tdLog.info("sql:%s, row:%d col:%d data:%f == expect:%f" %
                             (self.sql, row, col, self.queryResult[row][col], data)) 
                 return

tests/script/fullGeneralSuite.sim

@@ -130,7 +130,6 @@ run general/parser/join.sim
 run general/parser/join_multivnode.sim
 run general/parser/select_with_tags.sim
 run general/parser/groupby.sim
-run general/parser/bug.sim
 run general/parser/tags_dynamically_specifiy.sim
 run general/parser/set_tag_vals.sim
 #unsupport run general/parser/repeatAlter.sim