From ce122d7cd89533a6eb758e76a47d7a022dc7cb89 Mon Sep 17 00:00:00 2001
From: xsren <285808407@qq.com>
Date: Fri, 9 Aug 2024 10:02:09 +0800
Subject: [PATCH] fix: timezone test case

---
 tests/army/frame/common.py          | 10 +++++-----
 tests/pytest/util/common.py         | 21 +++++++++++++++----
 tests/system-test/2-query/normal.py | 31 ++++++++++++++++-------------
 3 files changed, 39 insertions(+), 23 deletions(-)

diff --git a/tests/army/frame/common.py b/tests/army/frame/common.py
index 39c2cc9ceb..913e88a7ad 100644
--- a/tests/army/frame/common.py
+++ b/tests/army/frame/common.py
@@ -524,19 +524,19 @@ class TDCom:
         # print(con)
         return con
 
-    def newcur(self,host='localhost',port=6030,user='root',password='taosdata', timezone='asia/shanghai'):
+    def newcur(self,host='localhost',port=6030,user='root',password='taosdata'):
         cfgPath = self.getClientCfgPath()
-        con=taos.connect(host=host, user=user, password=password, config=cfgPath, port=port, timezone=timezone)
+        con=taos.connect(host=host, user=user, password=password, config=cfgPath, port=port)
         cur=con.cursor()
         # print(cur)
         return cur
 
-    def newTdSql(self, host='localhost',port=6030,user='root',password='taosdata', timezone='asia/shanghai'):
+    def newTdSql(self, host='localhost',port=6030,user='root',password='taosdata'):
         newTdSql = TDSql()
-        cur = self.newcur(host=host,port=port,user=user,password=password, timezone=timezone)
+        cur = self.newcur(host=host,port=port,user=user,password=password)
         newTdSql.init(cur, False)
         return newTdSql
- 
+     
     ################################################################################################################
     # port from the common.py of new test frame
     ################################################################################################################
diff --git a/tests/pytest/util/common.py b/tests/pytest/util/common.py
index 15604e0042..dee3f505c9 100644
--- a/tests/pytest/util/common.py
+++ b/tests/pytest/util/common.py
@@ -543,16 +543,29 @@ class TDCom:
         # print(con)
         return con
 
-    def newcur(self,host='localhost',port=6030,user='root',password='taosdata',database=None, timezone='asia/shanghai'):
+    def newcur(self,host='localhost',port=6030,user='root',password='taosdata',database=None):
         cfgPath = self.getClientCfgPath()
-        con=taos.connect(host=host, user=user, password=password, config=cfgPath, port=port,database=database, timezone=timezone)
+        con=taos.connect(host=host, user=user, password=password, config=cfgPath, port=port,database=database)
         cur=con.cursor()
         # print(cur)
         return cur
 
-    def newTdSql(self, host='localhost',port=6030,user='root',password='taosdata', database = None, timezone='asia/shanghai'):
+    def newTdSql(self, host='localhost',port=6030,user='root',password='taosdata', database = None):
         newTdSql = TDSql()
-        cur = self.newcur(host=host,port=port,user=user,password=password, database=database, timezone=timezone)
+        cur = self.newcur(host=host,port=port,user=user,password=password, database=database)
+        newTdSql.init(cur, False)
+        return newTdSql
+    
+    def newcurWithTimezone(self,  timezone, host='localhost', port=6030,  user='root', password='taosdata'):
+        cfgPath = self.getClientCfgPath()
+        con=taos.connect(host=host, user=user, password=password, config=cfgPath, port=port, timezone=timezone)
+        cur=con.cursor()
+        # print(cur)
+        return cur
+
+    def newTdSqlWithTimezone(self, timezone, host='localhost',port=6030,user='root',password='taosdata'):
+        newTdSql = TDSql()
+        cur = self.newcurWithTimezone(host=host,port=port,user=user,password=password, timezone=timezone)
         newTdSql.init(cur, False)
         return newTdSql
 
diff --git a/tests/system-test/2-query/normal.py b/tests/system-test/2-query/normal.py
index eb8104e272..f4b40f408b 100644
--- a/tests/system-test/2-query/normal.py
+++ b/tests/system-test/2-query/normal.py
@@ -130,26 +130,29 @@ class TDTestCase:
 
     def timeZoneTest(self):
         dbname = self.dbname
-        tdSql.execute(f'create table {dbname}.tzt(ts timestamp, c1 int)')
-        tdSql.execute(f'insert into {dbname}.tzt values({self.ts}, 1)')
-        tdSql.query(f"select * from {dbname}.tzt")
-        tdSql.checkRows(1)
-        tdSql.checkData(0, 0, "2018-09-17 09:00:00")
-        
-        tdsql1 = tdCom.newTdSql(timezone="UTC")
+        tdsql1 = tdCom.newTdSqlWithTimezone(timezone="Asia/Shanghai")
+        tdsql1.execute(f'create table {dbname}.tzt(ts timestamp, c1 int)')
+        tdsql1.execute(f'insert into {dbname}.tzt values({self.ts}, 1)')
         tdsql1.query(f"select * from {dbname}.tzt")
         tdsql1.checkRows(1)
-        tdsql1.checkData(0, 0, "2018-09-17 01:00:00")
+        tdsql1.checkData(0, 0, "2018-09-17 09:00:00")
+        
+        tdsql2 = tdCom.newTdSqlWithTimezone(timezone="UTC")
+        tdsql2.query(f"select * from {dbname}.tzt")
+        tdsql2.checkRows(1)
+        tdsql2.checkData(0, 0, "2018-09-17 01:00:00")
         
         
-        tdsql1.execute(f'insert into {dbname}.tzt values({self.ts + 1000}, 2)')
-        tdsql1.query(f"select * from {dbname}.tzt order by ts")
-        tdsql1.checkRows(2)
-        tdsql1.checkData(1, 0, "2018-09-17 01:00:01")
-        
-        tdsql2 = tdCom.newTdSql(timezone="Asia/Shanghai")
+        tdsql2.execute(f'insert into {dbname}.tzt values({self.ts + 1000}, 2)')
         tdsql2.query(f"select * from {dbname}.tzt order by ts")
         tdsql2.checkRows(2)
+        tdsql2.checkData(0, 0, "2018-09-17 01:00:00")
+        tdsql2.checkData(1, 0, "2018-09-17 01:00:01")
+        
+        tdsql2 = tdCom.newTdSqlWithTimezone(timezone="Asia/Shanghai")
+        tdsql2.query(f"select * from {dbname}.tzt order by ts")
+        tdsql2.checkRows(2)
+        tdsql2.checkData(0, 0, "2018-09-17 09:00:00")
         tdsql2.checkData(1, 0, "2018-09-17 09:00:01")
 
     def run(self):