test: add test cases for taos shell restful (#13037)

* fix: update taos-tools
”

* test: add test cases for taos shell restful

* test: add test cases

* test: add more than 100 rows query in test

src/kit/shell/src/shellEngine.c

@@ -114,6 +114,7 @@ void shellInit(SShellArguments *_args) {
       fflush(stdout);
       exit(EXIT_FAILURE);
     }
+  }
 
     /* Read history TODO : release resources here*/
     read_history();
@@ -147,7 +148,7 @@ void shellInit(SShellArguments *_args) {
       exit(EXIT_SUCCESS);
     }
 #endif
-  }
+  
   return;
 }
 

tests/develop-test/0-others/taos_shell.py

+###################################################################
+#           Copyright (c) 2016 by TAOS Technologies, Inc.
+#                     All rights reserved.
+#
+#  This file is proprietary and confidential to TAOS Technologies.
+#  No part of this file may be reproduced, db_test.stored, transmitted,
+#  disclosed or used in any form or by any means other than as
+#  expressly provided by the written permission from Jianhui Tao
+#
+###################################################################
+
+# -*- coding: utf-8 -*-
+import os
+import time
+import sys
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+import json
+
+
+class TDTestCase:
+    def caseDescription(self):
+        '''
+        [TD-16023]test taos shell with restful interface
+        '''
+        return
+
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def getPath(self, tool="taos"):
+        selfPath = os.path.dirname(os.path.realpath(__file__))
+
+        if ("community" in selfPath):
+            projPath = selfPath[:selfPath.find("community")]
+        else:
+            projPath = selfPath[:selfPath.find("tests")]
+
+        paths = []
+        for root, dirs, files in os.walk(projPath):
+            if ((tool) in files):
+                rootRealPath = os.path.dirname(os.path.realpath(root))
+                if ("packaging" not in rootRealPath):
+                    paths.append(os.path.join(root, tool))
+                    break
+        if (len(paths) == 0):
+            tdLog.exit("%s not found!" % tool)
+            return
+        else:
+            tdLog.info("%s found in %s" %(tool,paths[0]))
+            return paths[0]
+
+    def shellrun(self, cmd):
+        command = "%s -R -s \"%s\"" %(self.binPath,cmd)
+        result = os.popen(command).read().strip()
+        return result
+    
+    def checkresult(self, cmd, expect):
+        result = self.shellrun(cmd)
+        if expect not in result:
+            print(f"{expect} not in {result} with command: {cmd}")
+            assert False
+        else:
+            print(f"pass command: {cmd}")
+
+    def run(self):
+        binPath = self.getPath()
+        self.binPath = binPath
+        self.checkresult("drop database if exists test", "Update OK")
+        self.checkresult("create database if not exists test", "Update OK")
+        self.checkresult("create stable test.stb (ts timestamp, c1 nchar(8), c2 double, c3 int) tags (t1 int)", "Update OK")
+        self.checkresult("create table test.tb1 using test.stb tags (1)", "Update OK")
+        self.checkresult("create table test.tb2 using test.stb tags (2)", "Update OK")
+        self.checkresult("select tbname from test.stb", "Query OK, 2 row(s) in set")
+        self.checkresult("insert into test.tb1 values (now, 'beijing', 1.23, 18)", "Update OK")
+        self.checkresult("insert into test.tb1 values (now, 'beijing', 1.23, 18)", "Update OK")
+        self.checkresult("insert into test.tb2 values (now, 'beijing', 1.23, 18)", "Update OK")
+        self.checkresult("insert into test.tb2 values (now, 'beijing', 1.23, 18)", "Update OK")
+        self.checkresult("select * from test.stb", "Query OK, 4 row(s) in set")
+        taosBenchmark = self.getPath(tool="taosBenchmark")
+        cmd = "%s -n 100 -t 100 -y" %taosBenchmark
+        tdLog.info("%s" % cmd)
+        os.system("%s" % cmd)
+        self.checkresult("select * from test.meters", "Query OK, 10000 row(s) in set")
+        self.checkresult("select * from test.meters","Notice: The result shows only the first 100 rows")
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
+

tests/develop-test/fulltest-others.sh

 python3 ./test.py -f 0-others/json_tag.py
-python3 ./test.py -f 0-others/TD-12435.py
+python3 ./test.py -f 0-others/TD-12435.py
\ No newline at end of file
+python3 ./test.py -f 0-others/taos_shell.py
\ No newline at end of file

tests/parallel_test/cases.task

@@ -714,6 +714,7 @@
 5,,develop-test,python3 ./test.py -f 2-query/session_two_stage.py 
 5,,develop-test,python3 ./test.py -f 2-query/function_histogram.py
 5,,develop-test,python3 ./test.py -f 0-others/TD-12435.py 
+5,,develop-test,python3 ./test.py -f 0-others/taos_shell.py
 5,,develop-test,python3 ./test.py -f 0-others/json_tag.py 
 5,,develop-test,python3 ./test.py -f 2-query/function_mode.py
 5,,develop-test,python3 ./test.py -f 2-query/function_now.py