Merge pull request #4964 from taosdata/xiaoping/add_test_case

[TD-2720][TD-2247][TD-1024]<test>: add test case

tests/pytest/account/account_create.py

@@ -24,6 +24,17 @@ class TDTestCase:
         tdSql.init(conn.cursor(), logSql)
 
     def run(self):
+        tdSql.query("show users")
+        rows = tdSql.queryRows
+
+        tdSql.execute("create user test PASS 'test' ")
+        tdSql.query("show users")
+        tdSql.checkRows(rows + 1)
+
+        tdSql.error("create user tdenginetdenginetdengine PASS 'test' ")
+
+        tdSql.error("create user tdenginet PASS '1234512345123456' ")
+
         try:
             tdSql.execute("create account a&cc PASS 'pass123'")
         except Exception as e:
@@ -32,6 +43,7 @@ class TDTestCase:
 
         tdLog.exit("drop built-in user is error.")
         
+
     def stop(self):
         tdSql.close()
         tdLog.success("%s successfully executed" % __file__)

tests/pytest/alter/alter_table.py

@@ -126,6 +126,8 @@ class TDTestCase:
         for i in range(2, size):             
             tdSql.checkData(0, i, self.rowNum * (size - i))
 
+        tdSql.error("alter local debugflag 143")
+
         tdSql.execute("create table st(ts timestamp, c1 int) tags(t1 float)")
         tdSql.execute("create table t0 using st tags(null)")
         tdSql.execute("alter table t0 set tag t1=2.1")

tests/pytest/fulltest.sh

@@ -175,6 +175,7 @@ python3 ./test.py -f query/bug2119.py
 python3 ./test.py -f query/isNullTest.py
 python3 ./test.py -f query/queryWithTaosdKilled.py
 python3 ./test.py -f query/floatCompare.py
+python3 ./test.py -f query/queryGroupbySort.py
 
 #stream
 python3 ./test.py -f stream/metric_1.py
@@ -259,3 +260,6 @@ python3 ./test.py -f update/bug_td2279.py
 
 # wal
 python3 ./test.py -f wal/addOldWalTest.py
+
+# account
+python3 ./test.py -f account/account_create.py
\ No newline at end of file

tests/pytest/query/queryGroupbySort.py

@@ -28,18 +28,23 @@ class TDTestCase:
     def run(self):
         tdSql.prepare()
 
-        tdSql.execute(
-            "create table stb(ts timestamp,i int) tags (p_id nchar(20));")
-        tdSql.execute(
-            "insert into tb using stb tags('11231') values (%d, %d) (%d, %d) (%d, %d) (%d, %d)" 
-            % (self.ts, 12, self.ts + 1, 15, self.ts + 2, 15, self.ts + 3, 12))
-
-        tdSql.query(''' select last(ts) p_time,i from stb where p_id='11231' and ts>=%d and ts <=%d 
-            group by i order by time desc limit 100 ''' % (self.ts, self.ts + 4))
-        tdSql.checkRows(2)
-        tdSql.checkData(0, 0, "2018-09-17 09:00:00.003000")
-        tdSql.checkData(1, 0, "2018-09-17 09:00:00.002000")
-
+        tdSql.execute("CREATE TABLE meters (ts timestamp, current float, voltage int, phase float) TAGS (location binary(64), groupId int)")
+        tdSql.execute("CREATE TABLE D1001 USING meters TAGS ('Beijing.Chaoyang', 2)")
+        tdSql.execute("CREATE TABLE D1002 USING meters TAGS ('Beijing.Chaoyang', 3)")
+        tdSql.execute("INSERT INTO D1001 VALUES (1538548685000, 10.3, 219, 0.31) (1538548695000, 12.6, 218, 0.33) (1538548696800, 12.3, 221, 0.31)")
+        tdSql.execute("INSERT INTO D1002 VALUES (1538548685001, 10.5, 220, 0.28)  (1538548696800, 12.3, 221, 0.31)")
+
+        tdSql.query("SELECT SUM(current), AVG(voltage) FROM meters WHERE groupId > 1 INTERVAL(1s) GROUP BY location order by ts DESC")
+        tdSql.checkRows(3)
+        tdSql.checkData(0, 0, "2018-10-03 14:38:16")
+        tdSql.checkData(1, 0, "2018-10-03 14:38:15")
+        tdSql.checkData(2, 0, "2018-10-03 14:38:05")
+
+        tdSql.query("SELECT SUM(current), AVG(voltage) FROM meters WHERE groupId > 1 INTERVAL(1s) GROUP BY location order by ts ASC")
+        tdSql.checkRows(3)
+        tdSql.checkData(0, 0, "2018-10-03 14:38:05")
+        tdSql.checkData(1, 0, "2018-10-03 14:38:15")
+        tdSql.checkData(2, 0, "2018-10-03 14:38:16")
         
     def stop(self):
         tdSql.close()