From 55b4a9339d8f9b42539cc6118f2c8c5fa8f7aa07 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Thu, 10 Jun 2021 10:47:30 +0800 Subject: [PATCH 1/4] [TD-4658] update enterprise test part --- tests/pytest/alter/alter_keep.py | 64 ++++++++++++++++++++------------ 1 file changed, 41 insertions(+), 23 deletions(-) diff --git a/tests/pytest/alter/alter_keep.py b/tests/pytest/alter/alter_keep.py index f73b8ce460..9d5db9c2ad 100644 --- a/tests/pytest/alter/alter_keep.py +++ b/tests/pytest/alter/alter_keep.py @@ -67,40 +67,57 @@ class TDTestCase: def alterKeepEnterprise(self): - ## enterprise only accept three inputs - ## does not accept 1 paramaters nor 3 paramaters + tdLog.notice('running Keep Keep Test, Enterprise Version') + #testing keep parameter during create tdSql.query('show databases') tdSql.checkData(0,7,'3650,3650,3650') + tdSql.execute('drop database db') + + tdSql.execute('create database db keep 100') + tdSql.query('show databases') + tdSql.checkData(0,7,'100,100,100') + tdSql.execute('drop database db') + + tdSql.execute('create database db keep 20, 30') + tdSql.query('show databases') + tdSql.checkData(0,7,'20,30,30') + tdSql.execute('drop database db') + + tdSql.execute('create database db keep 30,40,50') + tdSql.query('show databases') + tdSql.checkData(0,7,'30,40,50') + tdSql.execute('drop database db') + + tdSql.error('create database db keep ') + tdSql.error('create database db keep 20,30,40,50') + tdSql.error('create database db keep 0') + tdSql.error('create database db keep 100,50') + tdSql.error('create database db keep 100,40,50') + tdSql.error('create database db keep 20,100,50') + tdSql.error('create database db keep 100,100,50') + + #testing keep parameter during alter + tdSql.execute('create database db') tdSql.execute('alter database db keep 10') tdSql.query('show databases') tdSql.checkData(0,7,'10,10,10') - ## the order for altering keep is keep(D), keep0, keep1. - ## if the order is changed, please modify the following test - ## to make sure the the test is accurate - - tdSql.execute('alter database db keep 10, 10 ,10') + tdSql.execute('alter database db keep 20,30') tdSql.query('show databases') - tdSql.checkData(0,7,'10,10,10') + tdSql.checkData(0,7,'20,30,30') - tdSql.error('alter database db keep 100, 98 ,99') + tdSql.execute('alter database db keep 100,200,300') tdSql.query('show databases') - tdSql.checkData(0,7,'10,10,10') + tdSql.checkData(0,7,'100,200,300') - tdSql.execute('alter database db keep 200, 200 ,200') - tdSql.query('show databases') - tdSql.checkData(0,7,'200,200,200') + tdSql.error('alter database db keep ') + tdSql.error('alter database db keep 20,30,40,50') + tdSql.error('alter database db keep 0') + tdSql.error('alter database db keep 100,50') + tdSql.error('alter database db keep 100,40,50') + tdSql.error('alter database db keep 20,100,50') - tdSql.execute('alter database db keep 198, 199 ,200') - tdSql.query('show databases') - tdSql.checkData(0,7,'198,199,200') - - # tdSql.execute('alter database db keep 3650,3650,3650') - # tdSql.error('alter database db keep 4000,3640') - # tdSql.error('alter database db keep 10,10') - # tdSql.query('show databases') - # tdSql.checkData(0,7,'3650,3650,3650') def run(self): tdSql.prepare() @@ -112,7 +129,8 @@ class TDTestCase: else: tdLog.debug('running community test') self.alterKeepCommunity() - + + tdSql.prepare() ##TODO: need to wait for TD-4445 to implement the following ## tests From 1b1a01fd46e7ed800dd9146c9a659969ace6250c Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Thu, 10 Jun 2021 11:09:13 +0800 Subject: [PATCH 2/4] [TD-4658] adding community test case --- tests/pytest/alter/alter_keep.py | 57 ++++++++++++-------------------- 1 file changed, 21 insertions(+), 36 deletions(-) diff --git a/tests/pytest/alter/alter_keep.py b/tests/pytest/alter/alter_keep.py index 9d5db9c2ad..1b15b009d9 100644 --- a/tests/pytest/alter/alter_keep.py +++ b/tests/pytest/alter/alter_keep.py @@ -23,48 +23,33 @@ class TDTestCase: tdSql.init(conn.cursor(), logSql) def alterKeepCommunity(self): - ## community accepts both 1 paramater, 2 parmaters and 3 paramaters - ## but paramaters other than paramater 1 will be ignored - ## only paramater 1 will be used + tdLog.notice('running Keep Keep Test, Community Version') + #testing keep parameter during create tdSql.query('show databases') - tdSql.checkData(0,7,'3650,3650,3650') + tdSql.checkData(0,7,'3650') + tdSql.execute('drop database db') - tdSql.execute('alter database db keep 10') + tdSql.execute('create database db keep 100') tdSql.query('show databases') - tdSql.checkData(0,7,'10,10,10') + tdSql.checkData(0,7,'100') + tdSql.execute('drop database db') - tdSql.execute('alter database db keep 50') + tdSql.error('create database db keep ') + tdSql.error('create database db keep 10,20') + tdSql.error('create database db keep 10,20') + tdSql.error('create database db keep 20,30,40,50') + + #testing keep parameter during alter + tdSql.execute('create database db') + + tdSql.execute('alter database db keep 100') tdSql.query('show databases') - tdSql.checkData(0,7,'50,50,50') - - tdSql.execute('alter database db keep 20') - tdSql.query('show databases') - tdSql.checkData(0,7,'20,20,20') - - tdSql.execute('alter database db keep 100, 98 ,99') - tdSql.query('show databases') - tdSql.checkData(0,7,'100,100,100') - - tdSql.execute('alter database db keep 99, 100 ,101') - tdSql.query('show databases') - tdSql.checkData(0,7,'99,99,99') - - tdSql.execute('alter database db keep 200, 199 ,198') - tdSql.query('show databases') - tdSql.checkData(0,7,'200,200,200') - - tdSql.execute('alter database db keep 4000,4001') - tdSql.query('show databases') - tdSql.checkData(0,7,'4000,4000,4000') - - tdSql.execute('alter database db keep 5000,50') - tdSql.query('show databases') - tdSql.checkData(0,7,'5000,5000,5000') - - tdSql.execute('alter database db keep 50,5000') - tdSql.query('show databases') - tdSql.checkData(0,7,'50,50,50') + tdSql.checkData(0,7,'100') + tdSql.error('alter database db keep ') + tdSql.error('alter database db keep 10,20') + tdSql.error('alter database db keep 10,20') + tdSql.error('alter database db keep 20,30,40,50') def alterKeepEnterprise(self): tdLog.notice('running Keep Keep Test, Enterprise Version') From 4395709e92a7539fa7249a3754228a752c36990f Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Thu, 10 Jun 2021 11:25:12 +0800 Subject: [PATCH 3/4] [TD-4658] community test case minor fix --- tests/pytest/alter/alter_keep.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/tests/pytest/alter/alter_keep.py b/tests/pytest/alter/alter_keep.py index 1b15b009d9..cf02edff35 100644 --- a/tests/pytest/alter/alter_keep.py +++ b/tests/pytest/alter/alter_keep.py @@ -23,7 +23,7 @@ class TDTestCase: tdSql.init(conn.cursor(), logSql) def alterKeepCommunity(self): - tdLog.notice('running Keep Keep Test, Community Version') + tdLog.notice('running Keep Test, Community Version') #testing keep parameter during create tdSql.query('show databases') tdSql.checkData(0,7,'3650') @@ -36,7 +36,7 @@ class TDTestCase: tdSql.error('create database db keep ') tdSql.error('create database db keep 10,20') - tdSql.error('create database db keep 10,20') + tdSql.error('create database db keep 10,20,30') tdSql.error('create database db keep 20,30,40,50') #testing keep parameter during alter @@ -48,11 +48,11 @@ class TDTestCase: tdSql.error('alter database db keep ') tdSql.error('alter database db keep 10,20') - tdSql.error('alter database db keep 10,20') + tdSql.error('alter database db keep 10,20,30') tdSql.error('alter database db keep 20,30,40,50') def alterKeepEnterprise(self): - tdLog.notice('running Keep Keep Test, Enterprise Version') + tdLog.notice('running Keep Test, Enterprise Version') #testing keep parameter during create tdSql.query('show databases') tdSql.checkData(0,7,'3650,3650,3650') From 97f8305ca980969674337f1f4b8e6ddd1c510b21 Mon Sep 17 00:00:00 2001 From: bryanchang0603 Date: Thu, 10 Jun 2021 11:34:24 +0800 Subject: [PATCH 4/4] [TD-4658] minor fix --- tests/pytest/alter/alter_keep.py | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/tests/pytest/alter/alter_keep.py b/tests/pytest/alter/alter_keep.py index cf02edff35..a734c660e8 100644 --- a/tests/pytest/alter/alter_keep.py +++ b/tests/pytest/alter/alter_keep.py @@ -35,6 +35,7 @@ class TDTestCase: tdSql.execute('drop database db') tdSql.error('create database db keep ') + tdSql.error('create database db keep 0') tdSql.error('create database db keep 10,20') tdSql.error('create database db keep 10,20,30') tdSql.error('create database db keep 20,30,40,50') @@ -47,9 +48,12 @@ class TDTestCase: tdSql.checkData(0,7,'100') tdSql.error('alter database db keep ') + tdSql.error('alter database db keep 0') tdSql.error('alter database db keep 10,20') tdSql.error('alter database db keep 10,20,30') tdSql.error('alter database db keep 20,30,40,50') + tdSql.query('show databases') + tdSql.checkData(0,7,'100') def alterKeepEnterprise(self): tdLog.notice('running Keep Test, Enterprise Version') @@ -79,7 +83,7 @@ class TDTestCase: tdSql.error('create database db keep 100,50') tdSql.error('create database db keep 100,40,50') tdSql.error('create database db keep 20,100,50') - tdSql.error('create database db keep 100,100,50') + tdSql.error('create database db keep 50,60,20') #testing keep parameter during alter tdSql.execute('create database db') @@ -102,6 +106,9 @@ class TDTestCase: tdSql.error('alter database db keep 100,50') tdSql.error('alter database db keep 100,40,50') tdSql.error('alter database db keep 20,100,50') + tdSql.error('alter database db keep 50,60,20') + tdSql.query('show databases') + tdSql.checkData(0,7,'100,200,300') def run(self):