Merge pull request #7112 from taosdata/test/td-5314

[TD-5314]<test>: finish schemaless test

tests/pytest/fulltest.sh

@@ -379,6 +379,7 @@ python3 test.py -f alter/alter_cacheLastRow.py
 python3 ./test.py -f query/querySession.py 
 python3 test.py -f  alter/alter_create_exception.py
 python3 ./test.py -f insert/flushwhiledrop.py
+python3 ./test.py -f insert/schemalessInsert.py
 
 #======================p4-end===============
 python3 test.py -f  tools/taosdemoAllTest/pytest.py

tests/pytest/util/sql.py

@@ -65,7 +65,7 @@ class TDSql:
             self.queryResult = None
             tdLog.info("sql:%s, expect error occured" % (sql))
 
-    def query(self, sql):
+    def query(self, sql, row_tag=None):
         self.sql = sql
         try:
             self.cursor.execute(sql)
@@ -77,21 +77,27 @@ class TDSql:
             args = (caller.filename, caller.lineno, sql, repr(e))
             tdLog.notice("%s(%d) failed: sql:%s, %s" % args)
             raise Exception(repr(e))
+        if row_tag:
+            return self.queryResult
         return self.queryRows
 
-    def getColNameList(self, sql):
+    def getColNameList(self, sql, col_tag=None):
         self.sql = sql
         try:
             col_name_list = []
+            col_type_list = []
             self.cursor.execute(sql)
             self.queryCols = self.cursor.description
             for query_col in self.queryCols:
                 col_name_list.append(query_col[0])
+                col_type_list.append(query_col[1])
         except Exception as e:
             caller = inspect.getframeinfo(inspect.stack()[1][0])
             args = (caller.filename, caller.lineno, sql, repr(e))
             tdLog.notice("%s(%d) failed: sql:%s, %s" % args)
             raise Exception(repr(e))
+        if col_tag:
+            return col_name_list, col_type_list
         return col_name_list
 
     def waitedQuery(self, sql, expectRows, timeout):
@@ -245,6 +251,22 @@ class TDSql:
             args = (caller.filename, caller.lineno, self.sql, col_name_list, expect_col_name_list)
             tdLog.exit("%s(%d) failed: sql:%s, col_name_list:%s != expect_col_name_list:%s" % args)
 
+    def checkEqual(self, elm, expect_elm):
+        if elm == expect_elm:
+            tdLog.info("sql:%s, elm:%s == expect_elm:%s" % (self.sql, elm, expect_elm))
+        else:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            args = (caller.filename, caller.lineno, self.sql, elm, expect_elm)
+            tdLog.exit("%s(%d) failed: sql:%s, elm:%s != expect_elm:%s" % args)
+
+    def checkNotEqual(self, elm, expect_elm):
+        if elm != expect_elm:
+            tdLog.info("sql:%s, elm:%s != expect_elm:%s" % (self.sql, elm, expect_elm))
+        else:
+            caller = inspect.getframeinfo(inspect.stack()[1][0])
+            args = (caller.filename, caller.lineno, self.sql, elm, expect_elm)
+            tdLog.exit("%s(%d) failed: sql:%s, elm:%s == expect_elm:%s" % args)
+
     def taosdStatus(self, state):
         tdLog.sleep(5)
         pstate = 0