xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix case

This commit is contained in:
cpwu 2022-05-21 17:47:26 +08:00
parent 3a7347586e
commit 1a8917cb5f
1 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/system-test/0-others/user_control.py
View File

@ -262,6 +262,9 @@ class TDTestCase:
def __change_user_priv(self, user: User, pre_priv, invoke=False): def __change_user_priv(self, user: User, pre_priv, invoke=False):
if user.priv == pre_priv and invoke : if user.priv == pre_priv and invoke :
return return
if user.name == "root":
return
if pre_priv.upper() == PRIVILEGES_ALL: if pre_priv.upper() == PRIVILEGES_ALL:
pre_weight = -5 if invoke else 5 pre_weight = -5 if invoke else 5
elif pre_priv.upper() == PRIVILEGES_READ: elif pre_priv.upper() == PRIVILEGES_READ:
@ -299,7 +302,7 @@ class TDTestCase:
tdSql.query(sql) tdSql.query(sql)
self.__change_user_priv(user=user, pre_priv=priv) self.__change_user_priv(user=user, pre_priv=priv)
user.db_set.add(dbname) user.db_set.add(dbname)
time.sleep(2) time.sleep(1)
def revoke_user(self, user: User = None, priv=PRIVILEGES_ALL, dbname=None): def revoke_user(self, user: User = None, priv=PRIVILEGES_ALL, dbname=None):
sql = self.__revoke_user_privileges(privilege=priv, dbname=dbname, user_name=user.name) sql = self.__revoke_user_privileges(privilege=priv, dbname=dbname, user_name=user.name)
@ -307,11 +310,9 @@ class TDTestCase:
if user is None or priv not in (PRIVILEGES_ALL, PRIVILEGES_READ, PRIVILEGES_WRITE): if user is None or priv not in (PRIVILEGES_ALL, PRIVILEGES_READ, PRIVILEGES_WRITE):
tdSql.error(sql) tdSql.error(sql)
tdSql.query(sql) tdSql.query(sql)
if user.name == "root":
return
self.__change_user_priv(user=user, pre_priv=priv, invoke=True) self.__change_user_priv(user=user, pre_priv=priv, invoke=True)
user.db_set.remove(dbname) user.db_set.remove(dbname)
time.sleep(2) time.sleep(1)
def test_priv_change_current(self): def test_priv_change_current(self):
tdLog.printNoPrefix("==========step 1.0: if do not grant, can not read/write") tdLog.printNoPrefix("==========step 1.0: if do not grant, can not read/write")