Merge pull request #5057 from taosdata/xiaoping/add_test_case

[TD-2714]<test>: add test case for stream

tests/pytest/cluster/clusterEnvSetup/basic.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, 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 random
+
+class ClusterTestcase:
+
+        
+    def run(self):
+        os.system("./buildClusterEnv.sh -n 3 -v 2.0.14.1")
+        os.system("yes|taosdemo -h 172.27.0.7 -n 100 -t 100 -x")
+        os.system("python3 ../../concurrent_inquiry.py -H 172.27.0.7 -T 4 -t 4 -l 10")
+
+clusterTest = ClusterTestcase()
+clusterTest.run()
\ No newline at end of file

tests/pytest/cluster/clusterEnvSetup/buildClusterEnv.sh

@@ -85,18 +85,18 @@ function clusterUp {
   cd $DOCKER_DIR
 
   if [ $NUM_OF_NODES -eq 3 ]; then
-    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION docker-compose up -d
+    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION VERSION=$VERSION docker-compose up -d
   fi
 
   if [ $NUM_OF_NODES -eq 4 ]; then
-    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION docker-compose -f docker-compose.yml -f node4.yml up -d
+    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION VERSION=$VERSION docker-compose -f docker-compose.yml -f node4.yml up -d
   fi
 
   if [ $NUM_OF_NODES -eq 5 ]; then
-    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION docker-compose -f docker-compose.yml -f node4.yml -f node5.yml up -d
+    PACKAGE=TDengine-server-$VERSION-Linux-x64.tar.gz DIR=TDengine-server-$VERSION VERSION=$VERSION docker-compose -f docker-compose.yml -f node4.yml -f node5.yml up -d
   fi
 }
 
 cleanEnv 
-# prepareBuild
-# clusterUp
\ No newline at end of file
+prepareBuild
+clusterUp
\ No newline at end of file

tests/pytest/cluster/clusterEnvSetup/docker-compose.yml

@@ -7,7 +7,7 @@ services:
        args:
          - PACKAGE=${PACKAGE}
          - EXTRACTDIR=${DIR}
-     image: 'tdengine:2.0.13.1'
+     image: 'tdengine:${VERSION}'
      container_name: 'td2.0-node1'     
      cap_add:
        - ALL
@@ -34,7 +34,8 @@ services:
          target: /etc/taos
        - type: bind
          source: /data
-         target: /root     
+         target: /root
+     hostname: node1     
      networks:
          taos_update_net:
              ipv4_address: 172.27.0.7
@@ -46,7 +47,7 @@ services:
        args:
          - PACKAGE=${PACKAGE}
          - EXTRACTDIR=${DIR}
-     image: 'tdengine:2.0.13.1'
+     image: 'tdengine:${VERSION}'
      container_name: 'td2.0-node2'     
      cap_add:
        - ALL
@@ -85,7 +86,7 @@ services:
        args:
          - PACKAGE=${PACKAGE}
          - EXTRACTDIR=${DIR}
-     image: 'tdengine:2.0.13.1'
+     image: 'tdengine:${VERSION}'
      container_name: 'td2.0-node3'     
      cap_add:
        - ALL

tests/pytest/stream/stream3.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, 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 sys
+import time
+import taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)                
+
+    def run(self):        
+        ts = 1500000000000
+        tbNum = 10
+        rowNum = 20
+
+        tdSql.prepare()
+
+        tdLog.info("===== step1 =====")        
+        tdSql.execute(
+            "create table stb0(ts timestamp, col1 binary(20), col2 nchar(20)) tags(tgcol int)")
+        for i in range(tbNum):
+            tdSql.execute("create table tb%d using stb0 tags(%d)" % (i, i))
+            for j in range(rowNum):
+                tdSql.execute(
+                    "insert into tb%d values (%d, 'binary%d', 'nchar%d')" %
+                    (i, ts + 60000 * j, j, j))
+        tdSql.execute("insert into tb0 values(%d, null, null)" % (ts + 10000000))
+        time.sleep(0.1)
+
+        tdLog.info("===== step2 =====")
+        tdSql.query(
+            "select count(*), count(col1), count(col2) from stb0 interval(1d)")
+        tdSql.checkData(0, 1, rowNum * tbNum + 1)
+        tdSql.checkData(0, 2, rowNum * tbNum)
+        tdSql.checkData(0, 3, rowNum * tbNum)
+
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum)
+        tdSql.execute(
+            "create table s0 as select count(*), count(col1), count(col2) from stb0 interval(1d)")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 1)
+
+        tdLog.info("===== step3 =====")
+        tdSql.waitedQuery("select * from s0", 1, 120)
+        try:
+            tdSql.checkData(0, 1, rowNum * tbNum + 1)
+            tdSql.checkData(0, 2, rowNum * tbNum)
+            tdSql.checkData(0, 3, rowNum * tbNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step4 =====")
+        tdSql.execute("drop table s0")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum)
+
+        tdLog.info("===== step5 =====")
+        tdSql.error("select * from s0")
+
+        tdLog.info("===== step6 =====")
+        time.sleep(0.1)
+        tdSql.execute(
+            "create table s0 as select count(*), count(col1), count(col2) from tb0 interval(1d)")
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 1)
+
+        tdLog.info("===== step7 =====")
+        tdSql.waitedQuery("select * from s0", 1, 120)
+        try:
+            tdSql.checkData(0, 1, rowNum + 1)
+            tdSql.checkData(0, 2, rowNum)
+            tdSql.checkData(0, 3, rowNum)
+        except Exception as e:
+            tdLog.info(repr(e))
+
+        tdLog.info("===== step8 =====")
+        tdSql.query(
+            "select count(*), count(col1), count(col2) from stb0 interval(1d)")
+        tdSql.checkData(0, 1, rowNum * tbNum + 1)
+        tdSql.checkData(0, 2, rowNum * tbNum)
+        tdSql.checkData(0, 3, rowNum * tbNum)
+        tdSql.query("show tables")
+        tdSql.checkRows(tbNum + 1)    
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())

tests/script/jenkins/basic.txt

@@ -196,6 +196,7 @@ cd ../../../debug; make
 ./test.sh -f general/table/table.sim
 ./test.sh -f general/table/tinyint.sim
 ./test.sh -f general/table/vgroup.sim
+./test.sh -f general/table/createmulti.sim
 
 ./test.sh -f general/tag/3.sim
 ./test.sh -f general/tag/4.sim

tests/script/jenkins/basic_1.txt

@@ -157,4 +157,4 @@
 ./test.sh -f general/table/table.sim
 ./test.sh -f general/table/tinyint.sim
 ./test.sh -f general/table/vgroup.sim
-
+./test.sh -f general/table/createmulti.sim
\ No newline at end of file