Merge pull request #4465 from taosdata/xiaoping/add_test_case

[TD-2322][TD-2318][TD-2337] <test> add test case

tests/pytest/client/noConnectionErrorTest.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
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import tdDnodes
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+    def run(self):
+        tdSql.prepare()
+
+        tdDnodes.stop(1)
+        sql = "use db"
+        
+        try:
+            tdSql.execute(sql)
+        except Exception as e:            
+            expectError = 'Unable to establish connection'
+            if expectError in str(e):                
+                pass
+            else:
+                caller = inspect.getframeinfo(inspect.stack()[1][1])
+                tdLog.exit("%s(%d) failed: sql:%s, expect error not occured" % (caller.filename, caller.lineno, sql))
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase()) 
+tdCases.addLinux(__file__, TDTestCase())

tests/pytest/fulltest.sh

@@ -163,6 +163,7 @@ python3 ./test.py -f query/bug2218.py
 python3 ./test.py -f query/bug2117.py
 python3 ./test.py -f query/bug2143.py
 python3 ./test.py -f query/sliding.py
+python3 ./test.py -f query/unionAllTest.py
 
 #stream
 python3 ./test.py -f stream/metric_1.py
@@ -179,6 +180,7 @@ python3 ./test.py -f alter/alter_table_crash.py
 python3 ./test.py -f client/client.py
 python3 ./test.py -f client/version.py
 python3 ./test.py -f client/alterDatabase.py
+python3 ./test.py -f client/noConnectionErrorTest.py
 
 # Misc
 python3 testCompress.py
@@ -213,6 +215,7 @@ python3 test.py -f query/queryFillTest.py
 python3 test.py -f tools/taosdemoTest.py
 python3 test.py -f tools/taosdumpTest.py
 python3 test.py -f tools/lowaTest.py
+python3 test.py -f tools/taosdemoTest2.py
 
 # subscribe
 python3 test.py -f subscribe/singlemeter.py

tests/pytest/query/unionAllTest.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 taos
+from util.log import tdLog
+from util.cases import tdCases
+from util.sql import tdSql
+import random
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.ts = 1500000000000
+        self.num = 10
+
+    def run(self):
+        tdSql.prepare()
+
+        tdSql.execute("create table st(ts timestamp, c1 int) tags(loc nchar(20))")
+        tdSql.execute("create table t0 using st tags('nchar0')")
+        tdSql.execute("create table t1 using st tags('nchar1')")
+        tdSql.execute("create table t2 using st tags('nchar2')")
+        tdSql.execute("create table t3 using st tags('nchar3')")
+        tdSql.execute("create table t4 using st tags('nchar4')")
+        tdSql.execute("create table t5 using st tags('nchar5')")
+
+        for i in range(self.num):
+            tdSql.execute("insert into t0 values(%d, %d)" % (self.ts + i, i))
+            tdSql.execute("insert into t1 values(%d, %d)" % (self.ts + i, i))
+            tdSql.execute("insert into t2 values(%d, %d)" % (self.ts + i, i))
+            tdSql.execute("insert into t3 values(%d, %d)" % (self.ts + i, i))
+            tdSql.execute("insert into t4 values(%d, %d)" % (self.ts + i, i))
+            tdSql.execute("insert into t5 values(%d, %d)" % (self.ts + i, i))                
+
+        sql = ''' select * from st where loc = 'nchar0' limit 1 union all select * from st where loc = 'nchar1' limit 1 union all select * from st where loc = 'nchar2' limit 1
+            union all select * from st where loc = 'nchar3' limit 1 union all select * from st where loc = 'nchar4' limit 1'''
+        tdSql.query(sql)
+        tdSql.checkRows(5)
+
+        sql = ''' select * from st where loc = 'nchar0' limit 1 union all select * from st where loc = 'nchar1' limit 1 union all select * from st where loc = 'nchar2' limit 1
+            union all select * from st where loc = 'nchar3' limit 1 union all select * from st where loc = 'nchar4' limit 1 union all select * from st where loc = 'nchar5''''
+        tdSql.query(sql)
+        tdSql.checkRows(6)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase())
\ No newline at end of file

tests/pytest/tools/taosdemoTest2.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 os
+from util.log import *
+from util.cases import *
+from util.sql import *
+from util.dnodes import *
+import threading
+import time
+
+
+class TDTestCase:
+    def init(self, conn, logSql):
+        tdLog.debug("start to execute %s" % __file__)
+        tdSql.init(conn.cursor(), logSql)
+
+        self.numberOfTables = 10
+        self.numberOfRecords = 1000000
+
+    def insertDataAndAlterTable(self, threadID):
+        if(threadID == 0):
+            os.system("yes | taosdemo -t %d -n %d" % (self.numberOfTables, self.numberOfRecords))
+        if(threadID == 1):
+            print("use test")
+            tdSql.execute("use test")
+            print("alter table test.meters add column f4 int")
+            tdSql.execute("alter table test.meters add column f4 int")
+            print("insert into test.t0 values (now, 1, 2, 3, 4)")
+            tdSql.execute("insert into test.t0 values (now, 1, 2, 3, 4)")
+
+    def run(self):        
+        tdSql.prepare()
+
+        t1 = threading.Thread(target=self.insertDataAndAlterTable, args=(0, ))
+        t2 = threading.Thread(target=self.insertDataAndAlterTable, args=(1, ))
+
+        t1.start()
+        time.sleep(2)
+        t2.start()
+        t1.join()
+        t2.join()
+
+        tdSql.query("select count(*) from test.meters")
+        tdSql.checkData(0, 0, self.numberOfRecords * self.numberOfTables + 1)
+
+    def stop(self):
+        tdSql.close()
+        tdLog.success("%s successfully executed" % __file__)
+
+
+tdCases.addWindows(__file__, TDTestCase())
+tdCases.addLinux(__file__, TDTestCase()) 
\ No newline at end of file