From 31ff7641815fd7ab290735514c812372e3a569ee Mon Sep 17 00:00:00 2001 From: kailixu Date: Tue, 21 Jan 2025 14:07:07 +0800 Subject: [PATCH 1/3] test: check default expire time --- tests/system-test/0-others/grant.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tests/system-test/0-others/grant.py b/tests/system-test/0-others/grant.py index 9e54d9ca37..e55754679a 100644 --- a/tests/system-test/0-others/grant.py +++ b/tests/system-test/0-others/grant.py @@ -158,9 +158,22 @@ class TDTestCase: tdSql.query(f'show grants;') tdSql.checkEqual(len(tdSql.queryResult), 1) infoFile.write(";".join(map(str,tdSql.queryResult[0])) + "\n") + tdLog.info(f"show grants: {tdSql.queryResult[0]}") + expireTimeStr=tdSql.queryResult[0][1] + serviceTimeStr=tdSql.queryResult[0][2] + tdLog.info(f"expireTimeStr: {expireTimeStr}, serviceTimeStr: {serviceTimeStr}") + expireTime = time.mktime(time.strptime(expireTimeStr, "%Y-%m-%d %H:%M:%S")) + serviceTime = time.mktime(time.strptime(serviceTimeStr, "%Y-%m-%d %H:%M:%S")) + tdLog.info(f"expireTime: {expireTime}, serviceTime: {serviceTime}") + tdLog.info(f"expireTimeStr: {expireTimeStr}, serviceTimeStr: {serviceTimeStr}") + tdSql.checkEqual(True, abs(expireTime - serviceTime - 864000) < 15) tdSql.query(f'show grants full;') - tdSql.checkEqual(len(tdSql.queryResult), 31) - + nOptionGrants = 31 + tdSql.checkEqual(len(tdSql.queryResult), nOptionGrants) + tdSql.checkEqual(tdSql.queryResult[0][2], serviceTimeStr) + for i in range(1, nOptionGrants): + tdSql.checkEqual(tdSql.queryResult[i][2], expireTimeStr) + if infoFile: infoFile.flush() From ab9973c34ebde7fbb7cd326cfa4df78e0fdae20a Mon Sep 17 00:00:00 2001 From: kailixu Date: Tue, 21 Jan 2025 14:09:21 +0800 Subject: [PATCH 2/3] test: check default expire time --- tests/system-test/0-others/grant.py | 1 - 1 file changed, 1 deletion(-) diff --git a/tests/system-test/0-others/grant.py b/tests/system-test/0-others/grant.py index e55754679a..c74a04df96 100644 --- a/tests/system-test/0-others/grant.py +++ b/tests/system-test/0-others/grant.py @@ -165,7 +165,6 @@ class TDTestCase: expireTime = time.mktime(time.strptime(expireTimeStr, "%Y-%m-%d %H:%M:%S")) serviceTime = time.mktime(time.strptime(serviceTimeStr, "%Y-%m-%d %H:%M:%S")) tdLog.info(f"expireTime: {expireTime}, serviceTime: {serviceTime}") - tdLog.info(f"expireTimeStr: {expireTimeStr}, serviceTimeStr: {serviceTimeStr}") tdSql.checkEqual(True, abs(expireTime - serviceTime - 864000) < 15) tdSql.query(f'show grants full;') nOptionGrants = 31 From 7ca98374ee1f57acdc4082bcac5e6f4404f5c321 Mon Sep 17 00:00:00 2001 From: kailixu Date: Tue, 21 Jan 2025 14:10:40 +0800 Subject: [PATCH 3/3] test: check default expire time --- tests/system-test/0-others/grant.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/tests/system-test/0-others/grant.py b/tests/system-test/0-others/grant.py index c74a04df96..490541539f 100644 --- a/tests/system-test/0-others/grant.py +++ b/tests/system-test/0-others/grant.py @@ -167,10 +167,10 @@ class TDTestCase: tdLog.info(f"expireTime: {expireTime}, serviceTime: {serviceTime}") tdSql.checkEqual(True, abs(expireTime - serviceTime - 864000) < 15) tdSql.query(f'show grants full;') - nOptionGrants = 31 - tdSql.checkEqual(len(tdSql.queryResult), nOptionGrants) + nGrantItems = 31 + tdSql.checkEqual(len(tdSql.queryResult), nGrantItems) tdSql.checkEqual(tdSql.queryResult[0][2], serviceTimeStr) - for i in range(1, nOptionGrants): + for i in range(1, nGrantItems): tdSql.checkEqual(tdSql.queryResult[i][2], expireTimeStr) if infoFile: