From 07aea5e350e7a2ee35f8c5728b1227cf9da4805e Mon Sep 17 00:00:00 2001
From: factosea <285808407@qq.com>
Date: Mon, 16 Dec 2024 14:11:27 +0800
Subject: [PATCH] fix: test case

---
 tests/parallel_test/cases.task        |  4 +++
 tests/system-test/2-query/Now.py      |  2 +-
 tests/system-test/2-query/operator.py | 44 +++++++++++++--------------
 3 files changed, 27 insertions(+), 23 deletions(-)

diff --git a/tests/parallel_test/cases.task b/tests/parallel_test/cases.task
index 879d93ab3a..f6d2972805 100644
--- a/tests/parallel_test/cases.task
+++ b/tests/parallel_test/cases.task
@@ -1071,6 +1071,10 @@
 ,,n,system-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/insertMix.py -N 3
 ,,n,system-test,python3 ./test.py -f 5-taos-tools/taosbenchmark/stt.py -N 3
 ,,n,system-test,python3 ./test.py -f eco-system/meta/database/keep_time_offset.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/operator.py
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/operator.py -Q 2
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/operator.py -Q 3
+,,y,system-test,./pytest.sh python3 ./test.py -f 2-query/operator.py -Q 4
 
 #tsim test
 ,,y,script,./test.sh -f tsim/query/timeline.sim
diff --git a/tests/system-test/2-query/Now.py b/tests/system-test/2-query/Now.py
index 273bfaa9f5..9e7d240c0a 100644
--- a/tests/system-test/2-query/Now.py
+++ b/tests/system-test/2-query/Now.py
@@ -43,7 +43,7 @@ class TDTestCase:
         self.symbol = ['+','-','*','/']
         self.error_values = ['abc','"abc"','!@','today()']
         self.db_percision = ['ms','us','ns']
-        self.test_values = [1.5, 10, 9223372036854775807, -9223372036854775808]
+        self.test_values = [1.5, 10]
     def tbtype_check(self,tb_type):
         if tb_type == 'normal table' or tb_type == 'child table':
             tdSql.checkRows(len(self.values_list))
diff --git a/tests/system-test/2-query/operator.py b/tests/system-test/2-query/operator.py
index ad9387deb5..2e2f0af802 100644
--- a/tests/system-test/2-query/operator.py
+++ b/tests/system-test/2-query/operator.py
@@ -102,35 +102,35 @@ class TDTestCase:
         tdSql.execute(f"CREATE TABLE {self.dbname}.t1( time TIMESTAMP, c0 INT);")
         tdSql.execute(f"INSERT INTO {self.dbname}.t1(time, c0) VALUES (1641024000000, 1);")
         
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE (time - c0) > 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE (time - c0) > 0;")
         tdSql.checkRows(1)
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE (time + c0) > 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE (time + c0) > 0;")
         tdSql.checkRows(1)
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE (-(- c0)) > 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE (-(- c0)) > 0;")
         tdSql.checkRows(1)
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE -(- c0) > 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE -(- c0) > 0;")
         tdSql.checkRows(1)
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE -(- c0) < 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE -(- c0) < 0;")
         tdSql.checkRows(0)
         
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE -(- c0) = 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE -(- c0) = 0;")
         tdSql.checkRows(0)
         
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE (- c0) > 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE (- c0) > 0;")
         tdSql.checkRows(0)
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE (- c0) < 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE (- c0) < 0;")
         tdSql.checkRows(1)
         
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE (time + (- c0)) > 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE (time + (- c0)) > 0;")
         tdSql.checkRows(1)
         
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE (time + (- c0)) > 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE (time + (- c0)) > 0;")
         tdSql.checkRows(1)
         
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE (time - (- (- c0)) ) > 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE (time - (- (- c0)) ) > 0;")
         tdSql.checkRows(1)
         
-        tdSql.query(f"SELECT time, c0 FROM t1 WHERE (time + (-(- c0))) > 0;")
+        tdSql.query(f"SELECT time, c0 FROM {self.dbname}.t1 WHERE (time + (-(- c0))) > 0;")
         tdSql.checkRows(1)
 
     def ts5758(self):
@@ -195,27 +195,27 @@ class TDTestCase:
         tdSql.execute(f"CREATE TABLE {self.dbname}.t1( time TIMESTAMP, c1 BIGINT);")
         tdSql.execute(f"INSERT INTO {self.dbname}.t1(time, c1) VALUES (1641024000000, 0);")
         
-        tdSql.query(f"SELECT c1 FROM t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001)")
+        tdSql.query(f"SELECT c1 FROM {self.dbname}.t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001)")
         tdSql.checkRows(1)
-        tdSql.query(f"SELECT c1 FROM t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) OR (1 < 2)")
+        tdSql.query(f"SELECT c1 FROM {self.dbname}.t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) OR (1 < 2)")
         tdSql.checkRows(1)
-        tdSql.query(f"SELECT c1 FROM t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) OR (3 < 2)")
+        tdSql.query(f"SELECT c1 FROM {self.dbname}.t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) OR (3 < 2)")
         tdSql.checkRows(1)
-        tdSql.query(f"SELECT c1 FROM t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) and (1 < 2)")
+        tdSql.query(f"SELECT c1 FROM {self.dbname}.t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) and (1 < 2)")
         tdSql.checkRows(1)
-        tdSql.query(f"SELECT c1 FROM t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) OR (1 > 2)")
+        tdSql.query(f"SELECT c1 FROM {self.dbname}.t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) OR (1 > 2)")
         tdSql.checkRows(1)
-        tdSql.query(f"SELECT c1 FROM t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) and (1 > 2)")
+        tdSql.query(f"SELECT c1 FROM {self.dbname}.t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) and (1 > 2)")
         tdSql.checkRows(0)
         
         tdSql.execute(f"INSERT INTO {self.dbname}.t1(time, c1) VALUES (1641024000001, 1);")
         tdSql.execute(f"INSERT INTO {self.dbname}.t1(time, c1) VALUES (1641024000002, 2);")
         
-        tdSql.query(f"SELECT c1 FROM t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) OR (1 < 2)")
+        tdSql.query(f"SELECT c1 FROM {self.dbname}.t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) OR (1 < 2)")
         tdSql.checkRows(3)
-        tdSql.query(f"SELECT c1 FROM t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) OR (1 > 2)")
+        tdSql.query(f"SELECT c1 FROM {self.dbname}.t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) OR (1 > 2)")
         tdSql.checkRows(2)      
-        tdSql.query(f"SELECT c1 FROM t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) and (1 < 2)")
+        tdSql.query(f"SELECT c1 FROM {self.dbname}.t1 WHERE (time BETWEEN 1641024000000 AND 1641024000001) and (1 < 2)")
         tdSql.checkRows(2)
 
     def operOnTime(self):
@@ -308,7 +308,7 @@ class TDTestCase:
         tdSql.query(f"SELECT sum(ts * c1), sum(ts*c2) from {self.dbname}.t2")
         tdSql.checkData(0, 0, 4923072000005)
         tdSql.checkData(0, 1, 4923072000005)
-        tdSql.query(f"SELECT ts / c1, ts/c2 from t2 order by {self.dbname}.ts")
+        tdSql.query(f"SELECT ts / c1, ts/c2 from {self.dbname}.t2 order by ts")
         tdSql.checkData(0, 0, 1641024000001)
         tdSql.checkData(0, 1, 1641024000001)
         tdSql.checkData(1, 0,  820512000001)