diff --git a/tests/pytest/TimeZone/TestCaseTimeZone.py b/tests/pytest/TimeZone/TestCaseTimeZone.py index d99af7b995cd59a9aeec69954a2034525e612433..0bad52ef9876e84b1e0f7ac4e508895844be23bf 100644 --- a/tests/pytest/TimeZone/TestCaseTimeZone.py +++ b/tests/pytest/TimeZone/TestCaseTimeZone.py @@ -57,172 +57,100 @@ class TDTestCase: tdSql.execute("create stable st (ts timestamp, id int ) tags (index int)") tdSql.execute("insert into tb0 using st tags (1) values ('2021-07-01 00:00:00.000',0)") - res = tdSql.getResult("select * from tb0") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 0), 0)]: - tdLog.info("time format is check pass : '2021-07-01 00:00:00.000' ") - else: - tdLog.info(" '2021-07-01 00:00:00.000' failed ") + tdSql.query("select ts from tb0") + tdSql.checkData(0, 0, "2021-07-01 00:00:00.000") tdSql.execute("insert into tb1 using st tags (1) values ('2021-07-01T00:00:00.000+07:50',1)") - res = tdSql.getResult("select * from tb1") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 10), 1)]: - tdLog.info("time format is check pass : '2021-07-01T00:00:00.000+07:50' ") - else: - tdLog.info(" '2021-07-01T00:00:00.000+07:50' failed ") - - tdSql.execute("insert into tb2 using st tags (1) values ('2021-07-01T00:00:00.000+08:00',2)") - res = tdSql.getResult("select * from tb2") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 0), 2)]: - tdLog.info("time format is check pass : '2021-07-01T00:00:00.000+08:00' ") - else: - tdLog.info(" '2021-07-01T00:00:00.000+08:00' failed ") + tdSql.query("select ts from tb1") + tdSql.checkData(0, 0, "2021-07-01 00:10:00.000") + tdSql.execute("insert into tb2 using st tags (1) values ('2021-07-01T00:00:00.000+08:00',2)") + tdSql.query("select ts from tb2") + tdSql.checkData(0, 0, "2021-07-01 00:00:00.000") + tdSql.execute("insert into tb3 using st tags (1) values ('2021-07-01T00:00:00.000Z',3)") - res = tdSql.getResult("select * from tb3") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 8, 0), 3)]: - tdLog.info("time format is check pass : '2021-07-01T00:00:00.000Z' ") - else: - tdLog.info(" '2021-07-01T00:00:00.000Z' failed ") + tdSql.query("select ts from tb3") + tdSql.checkData(0, 0, "2021-07-01 08:00:00.000") tdSql.execute("insert into tb4 using st tags (1) values ('2021-07-01 00:00:00.000+07:50',4)") - res = tdSql.getResult("select * from tb4") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 10), 4)]: - tdLog.info("time format is check pass : '2021-07-01 00:00:00.000+07:50' ") - else: - tdLog.info(" '2021-07-01 00:00:00.000+07:50' failed ") + tdSql.query("select ts from tb4") + tdSql.checkData(0, 0, "2021-07-01 00:10:00.000") tdSql.execute("insert into tb5 using st tags (1) values ('2021-07-01 00:00:00.000Z',5)") - res = tdSql.getResult("select * from tb5") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 8, 0), 5)]: - tdLog.info("time format is check pass : '2021-07-01 00:00:00.000Z' ") - else: - tdLog.info(" '2021-07-01 00:00:00.000Z' failed ") + tdSql.query("select ts from tb5") + tdSql.checkData(0, 0, "2021-07-01 08:00:00.000") tdSql.execute("insert into tb6 using st tags (1) values ('2021-07-01T00:00:00.000+0800',6)") - res = tdSql.getResult("select * from tb6") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 0), 6)]: - tdLog.info("time format is check pass : '2021-07-01T00:00:00.000+0800' ") - else: - tdLog.info(" '2021-07-01T00:00:00.000+0800' failed ") + tdSql.query("select ts from tb6") + tdSql.checkData(0, 0, "2021-07-01 00:00:00.000") tdSql.execute("insert into tb7 using st tags (1) values ('2021-07-01 00:00:00.000+0800',7)") - res = tdSql.getResult("select * from tb7") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 0), 7)]: - tdLog.info("time format is check pass : '2021-07-01 00:00:00.000+0800' ") - else: - tdLog.info(" '2021-07-01 00:00:00.000+0800' failed ") + tdSql.query("select ts from tb7") + tdSql.checkData(0, 0, "2021-07-01 00:00:00.000") tdSql.execute("insert into tb8 using st tags (1) values ('2021-07-0100:00:00.000',8)") - res = tdSql.getResult("select * from tb8") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 0), 8)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000' ") - else: - tdLog.info(" '2021-07-0100:00:00.000' failed ") + tdSql.query("select ts from tb8") + tdSql.checkData(0, 0, "2021-07-01 00:00:00.000") tdSql.execute("insert into tb9 using st tags (1) values ('2021-07-0100:00:00.000+0800',9)") - res = tdSql.getResult("select * from tb9") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 0), 9)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000+0800' ") - else: - tdLog.info(" '2021-07-0100:00:00.000+0800' failed ") + tdSql.query("select ts from tb9") + tdSql.checkData(0, 0, "2021-07-01 00:00:00.000") tdSql.execute("insert into tb10 using st tags (1) values ('2021-07-0100:00:00.000+08:00',10)") - res = tdSql.getResult("select * from tb10") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 0), 10)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000+08:00' ") - else: - tdLog.info(" '2021-07-0100:00:00.000+08:00' failed ") + tdSql.query("select ts from tb10") + tdSql.checkData(0, 0, "2021-07-01 00:00:00.000") tdSql.execute("insert into tb11 using st tags (1) values ('2021-07-0100:00:00.000+07:00',11)") - res = tdSql.getResult("select * from tb11") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 1, 0), 11)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000+07:00' ") - else: - tdLog.info(" '2021-07-0100:00:00.000+07:00' failed ") + tdSql.query("select ts from tb11") + tdSql.checkData(0, 0, "2021-07-01 01:00:00.000") - tdSql.execute("insert into tb12 using st tags (1) values ('2021-07-0100:00:00.000+07:00',12)") - res = tdSql.getResult("select * from tb12") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 1, 0), 12)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000+07' ") - else: - tdLog.info(" '2021-07-0100:00:00.000+07' failed ") + tdSql.execute("insert into tb12 using st tags (1) values ('2021-07-0100:00:00.000+0700',12)") + tdSql.query("select ts from tb12") + tdSql.checkData(0, 0, "2021-07-01 01:00:00.000") tdSql.execute("insert into tb13 using st tags (1) values ('2021-07-0100:00:00.000+07:12',13)") - res = tdSql.getResult("select * from tb13") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 48), 13)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000+07:12' ") - else: - tdLog.info(" '2021-07-0100:00:00.000+07:12' failed ") + tdSql.query("select ts from tb13") + tdSql.checkData(0, 0, "2021-07-01 00:48:00.000") tdSql.execute("insert into tb14 using st tags (1) values ('2021-07-0100:00:00.000+712',14)") - res = tdSql.getResult("select * from tb14") - print(res) - if res == [(datetime.datetime(2021, 6, 28, 8, 58), 14)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000+712' ") - else: - tdLog.info(" '2021-07-0100:00:00.000+712' failed ") + tdSql.query("select ts from tb14") + tdSql.checkData(0, 0, "2021-06-28 08:58:00.000") tdSql.execute("insert into tb15 using st tags (1) values ('2021-07-0100:00:00.000Z',15)") - res = tdSql.getResult("select * from tb15") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 8, 0), 15)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000Z' ") - else: - tdLog.info(" '2021-07-0100:00:00.000Z' failed ") + tdSql.query("select ts from tb15") + tdSql.checkData(0, 0, "2021-07-01 08:00:00.000") tdSql.execute("insert into tb16 using st tags (1) values ('2021-7-1 00:00:00.000Z',16)") - res = tdSql.getResult("select * from tb16") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 8, 0), 16)]: - tdLog.info("time format is check pass : '2021-7-1 00:00:00.000Z' ") - else: - tdLog.info(" '2021-7-1 00:00:00.000Z' failed ") + tdSql.query("select ts from tb16") + tdSql.checkData(0, 0, "2021-07-01 08:00:00.000") tdSql.execute("insert into tb17 using st tags (1) values ('2021-07-0100:00:00.000+0750',17)") - res = tdSql.getResult("select * from tb17") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 10), 17)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000+0750' ") - else: - tdLog.info(" '2021-07-0100:00:00.000+0750' failed ") + tdSql.query("select ts from tb17") + tdSql.checkData(0, 0, "2021-07-01 00:10:00.000") tdSql.execute("insert into tb18 using st tags (1) values ('2021-07-0100:00:00.000+0752',18)") - res = tdSql.getResult("select * from tb18") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 8), 18)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000+0752' ") - else: - tdLog.info(" '2021-07-0100:00:00.000+0752' failed ") + tdSql.query("select ts from tb18") + tdSql.checkData(0, 0, "2021-07-01 00:08:00.000") tdSql.execute("insert into tb19 using st tags (1) values ('2021-07-0100:00:00.000+075',19)") - res = tdSql.getResult("select * from tb19") - print(res) - if res == [(datetime.datetime(2021, 7, 1, 0, 55), 19)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000+075' ") - else: - tdLog.info(" '2021-07-0100:00:00.000+075' failed ") + tdSql.query("select ts from tb19") + tdSql.checkData(0, 0, "2021-07-01 00:55:00.000") tdSql.execute("insert into tb20 using st tags (1) values ('2021-07-0100:00:00.000+75',20)") - res = tdSql.getResult("select * from tb20") - print(res) - if res == [(datetime.datetime(2021, 6, 28, 5, 0), 20)]: - tdLog.info("time format is check pass : '2021-07-0100:00:00.000+75' ") - else: - tdLog.info(" '2021-07-0100:00:00.000+75' failed ") + tdSql.query("select ts from tb20") + tdSql.checkData(0, 0, "2021-06-28 05:00:00.000") + + tdSql.execute("insert into tb21 using st tags (1) values ('2021-7-1 1:1:1.234+075',21)") + tdSql.query("select ts from tb21") + tdSql.checkData(0, 0, "2021-07-01 01:56:01.234") + + tdSql.execute("insert into tb22 using st tags (1) values ('2021-7-1T1:1:1.234+075',22)") + tdSql.query("select ts from tb22") + tdSql.checkData(0, 0, "2021-07-01 01:56:01.234") + + tdSql.execute("insert into tb23 using st tags (1) values ('2021-7-131:1:1.234+075',22)") + tdSql.query("select ts from tb23") + tdSql.checkData(0, 0, "2021-07-13 01:56:01.234") tdSql.error("insert into tberror using st tags (1) values ('20210701 00:00:00.000+0800',0)") @@ -230,15 +158,10 @@ class TDTestCase: tdSql.error("insert into tberror using st tags (1) values ('202171 00:00:00.000+0800',0)") tdSql.error("insert into tberror using st tags (1) values ('2021 07 01 00:00:00.000+0800',0)") tdSql.error("insert into tberror using st tags (1) values ('2021 -07-0100:00:00.000+0800',0)") - - - - - - + tdSql.error("insert into tberror using st tags (1) values ('2021-7-11:1:1.234+075',0)") + os.system("rm -rf ./TimeZone/*.py.sql") - diff --git a/tests/pytest/fulltest.sh b/tests/pytest/fulltest.sh index bc410107e6b5fc3bd2528ff8904c3125d2370a15..fb609430c99832d85fdd7cd4bed51577720acfc1 100755 --- a/tests/pytest/fulltest.sh +++ b/tests/pytest/fulltest.sh @@ -29,6 +29,10 @@ python3 ./test.py -f insert/in_function.py python3 ./test.py -f insert/modify_column.py python3 ./test.py -f insert/line_insert.py +# timezone + +python3 ./test.py -f TimeZone/TestCaseTimeZone.py + #table python3 ./test.py -f table/alter_wal0.py python3 ./test.py -f table/column_name.py