From d3fd2e4b3ce99ed13fd072f6736f71d310111bcd Mon Sep 17 00:00:00 2001 From: jiacy-jcy Date: Wed, 6 Jul 2022 09:51:16 +0800 Subject: [PATCH] update test case --- tests/system-test/2-query/Timediff.py | 6 +++--- tests/system-test/2-query/timetruncate.py | 9 ++++++--- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/tests/system-test/2-query/Timediff.py b/tests/system-test/2-query/Timediff.py index 8c49d2a661..70cf34e766 100644 --- a/tests/system-test/2-query/Timediff.py +++ b/tests/system-test/2-query/Timediff.py @@ -17,8 +17,8 @@ class TDTestCase: ] self.db_param_precision = ['ms','us','ns'] - self.time_unit = ['1w','1d','1h','1m','1s','1a','1u'] - self.error_unit = ['1b','2w','2d','2h','2m','2s','2a','2u','1c','#1'] + self.time_unit = ['1w','1d','1h','1m','1s','1a','1u','1b'] + self.error_unit = ['2w','2d','2h','2m','2s','2a','2u','1c','#1'] self.ntbname = 'ntb' self.stbname = 'stb' self.ctbname = 'ctb' @@ -39,7 +39,7 @@ class TDTestCase: tdSql.query(f'select timediff(ts,{self.subtractor},{unit}) from {self.stbname}') def data_check(self,date_time,precision,tb_type): for unit in self.time_unit: - if (unit.lower() == '1u' and precision.lower() == 'ms') or () : + if (unit.lower() == '1u' and precision.lower() == 'ms') or (unit.lower() == '1b' and precision.lower() == 'us') or (unit.lower() == '1b' and precision.lower() == 'ms'): if tb_type.lower() == 'ntb': tdSql.error(f'select timediff(ts,{self.subtractor},{unit}) from {self.ntbname}') elif tb_type.lower() == 'ctb': diff --git a/tests/system-test/2-query/timetruncate.py b/tests/system-test/2-query/timetruncate.py index 06a657cecf..ee302a1d8e 100644 --- a/tests/system-test/2-query/timetruncate.py +++ b/tests/system-test/2-query/timetruncate.py @@ -19,7 +19,7 @@ class TDTestCase: '2020-5-1 00:00:00.001002001' ] self.db_param_precision = ['ms','us','ns'] - self.time_unit = ['1w','1d','1h','1m','1s','1a','1u'] + self.time_unit = ['1w','1d','1h','1m','1s','1a','1u','1b'] self.error_unit = ['2w','2d','2h','2m','2s','2a','2u','1c','#1'] self.error_unit = ['2w','2d','2h','2m','2s','2a','2u','1c','#1'] self.ntbname = 'ntb' @@ -80,7 +80,10 @@ class TDTestCase: ts_result = self.get_time.get_us_timestamp(str(tdSql.queryResult[i][0])) tdSql.checkEqual(ts_result,int(date_time[i]/1000/1000/60/60/24/7)*7*24*60*60*1000*1000) def check_ns_timestamp(self,unit,date_time): - if unit.lower() == '1u': + if unit.lower() == '1b': + for i in range(len(self.ts_str)): + tdSql.checkEqual(tdSql.queryResult[i][0],int(date_time[i])) + elif unit.lower() == '1u': for i in range(len(self.ts_str)): tdSql.checkEqual(tdSql.queryResult[i][0],int(date_time[i]*1000/1000/1000)*1000) elif unit.lower() == '1a': @@ -110,7 +113,7 @@ class TDTestCase: tdSql.query(f'select timetruncate(ts,{unit}) from {self.stbname}') def data_check(self,date_time,precision,tb_type): for unit in self.time_unit: - if (unit.lower() == '1u' and precision.lower() == 'ms') or (unit.lower() == '1b' and precision.lower() == 'us'): + if (unit.lower() == '1u' and precision.lower() == 'ms') or (unit.lower() == '1b' and precision.lower() == 'us') or (unit.lower() == '1b' and precision.lower() == 'ms'): if tb_type.lower() == 'ntb': tdSql.error(f'select timetruncate(ts,{unit}) from {self.ntbname}') elif tb_type.lower() == 'ctb': -- GitLab