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

fix: ci errors

This commit is contained in:
Shengliang Guan 2024-12-10 15:15:17 +00:00
parent b212aec1db
commit 3dea56f431
5 changed files with 28 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -182,14 +182,14 @@ class TDTestCase:
for i in range(self.users_count):
user = User()
user.name = f"user_test{i}"
user.passwd = f"taosdata{i}"
user.passwd = f"taosdata@1{i}"
user.db_set = set()
self.users.append(user)
return self.users
@property
def __passwd_list(self):
return [f"taosdata{i}" for i in range(self.users_count) ]
return [f"taosdata@1{i}" for i in range(self.users_count) ]
@property
def __privilege(self):
@ -258,12 +258,12 @@ class TDTestCase:
def alter_pass_err(self): # sourcery skip: remove-redundant-fstring
sqls = [
f"alter users {self.__user_list[0]} pass 'newpass' " ,
f"alter users {self.__user_list[0]} pass 'newpassT1' " ,
f"alter user {self.__user_list[0]} pass '' " ,
f"alter user {self.__user_list[0]} pass ' ' " ,
f"alter user anyuser pass 'newpass' " ,
f"alter user anyuser pass 'newpassT1' " ,
f"alter user {self.__user_list[0]} pass " ,
f"alter user {self.__user_list[0]} password 'newpass' " ,
f"alter user {self.__user_list[0]} password 'newpassT1' " ,
]
for sql in sqls:
tdSql.error(sql)
@ -649,7 +649,7 @@ class TDTestCase:
# user = conn
# 不能创建用户
tdLog.printNoPrefix("==========step4.1: normal user can not create user")
user.error("create use utest1 pass 'utest1pass'")
user.error("create use utest1 pass 'utest1Pass'")
# 可以查看用户
tdLog.printNoPrefix("==========step4.2: normal user can show user")
user.query("show users")

16
tests/system-test/1-insert/boundary.py
View File

@ -33,7 +33,7 @@ class TDTestCase:
self.colname_length_boundary = self.boundary.COL_KEY_MAX_LENGTH
self.tagname_length_boundary = self.boundary.TAG_KEY_MAX_LENGTH
self.username_length_boundary = 23
self.password_length_boundary = 31
self.password_length_boundary = 14
def dbname_length_check(self):
dbname_length = randint(1,self.dbname_length_boundary-1)
for dbname in [tdCom.get_long_name(self.dbname_length_boundary),tdCom.get_long_name(dbname_length)]:
@ -134,13 +134,17 @@ class TDTestCase:
tdLog.exit("error info is not true")
def password_length_check(self):
password_length = randint(1,self.password_length_boundary-1)
password_length = randint(8,self.password_length_boundary-1)
index = 0
for password in [tdCom.get_long_name(password_length),tdCom.get_long_name(self.password_length_boundary)]:
username = tdCom.get_long_name(3)
tdSql.execute(f'create user {username} pass "{password}"')
index += 1
username = tdCom.get_long_name(12) + str(index)
tdSql.execute(f'create user {username} pass "{password}@1"')
index += 1
username = tdCom.get_long_name(12) + str(index)
password = tdCom.get_long_name(self.password_length_boundary+1)
tdSql.error(f'create user {username} pass "{password}"')
if "Name or password too long" in tdSql.error_info:
tdSql.error(f'create user {username} pass "{password}@1"')
if "Invalid password format" in tdSql.error_info:
tdLog.info("error info is true!")
else:
tdLog.exit("error info is not true")

12
tests/system-test/6-cluster/5dnode3mnodeRestartDnodeInsertData.py
View File

@ -163,15 +163,15 @@ class TDTestCase:
threads.append(threading.Thread(target=clusterComCreate.insert_data, args=(newTdSql, paraDict["dbName"],stableName,paraDict["ctbNum"],paraDict["rowsPerTbl"],paraDict["batchNum"],paraDict["startTs"])))
for i in range(5):
clusterComCreate.createUser(newTdSql,f"user{i}",f"pass{i}")
userTdSql=tdCom.newTdSql(user=f"user{i}",password=f"pass{i}")
clusterComCreate.alterUser(userTdSql,f"user{i}",f"pass{i+1}")
clusterComCreate.createUser(newTdSql,f"user{i}",f"passwd@{i}")
userTdSql=tdCom.newTdSql(user=f"user{i}",password=f"passwd@{i}")
clusterComCreate.alterUser(userTdSql,f"user{i}",f"passwd@{i+1}")
clusterComCreate.deleteUser(newTdSql,f"user{i}")
for j in range(5):
i=100
clusterComCreate.createUser(newTdSql,f"user{i}",f"pass{i}")
userTdSql=tdCom.newTdSql(user=f"user{i}",password=f"pass{i}")
clusterComCreate.alterUser(userTdSql,f"user{i}",f"pass{i+1}")
clusterComCreate.createUser(newTdSql,f"user{i}",f"passwd@{i}")
userTdSql=tdCom.newTdSql(user=f"user{i}",password=f"passwd@{i}")
clusterComCreate.alterUser(userTdSql,f"user{i}",f"passwd@{i+1}")
clusterComCreate.deleteUser(newTdSql,f"user{i}")
for tr in threads:

2
tests/system-test/99-TDcase/TS-5130.py
View File

@ -31,7 +31,7 @@ class TDTestCase:
def run(self):
self.prepare_user()
self.test_connect_user('root')
self.test_connect_user('test123@#$')
self.test_connect_user('test')
def stop(self):
tdSql.close()

10
utils/test/c/sml_test.c
View File

@ -1436,7 +1436,7 @@ int sml_td22900_Test() {
int sml_td24070_Test() {
TAOS *taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
TAOS_RES *pRes = taos_query(taos, "CREATE user test_db pass 'test'");
TAOS_RES *pRes = taos_query(taos, "CREATE user test_db pass 'test@123'");
ASSERT(taos_errno(pRes) == 0);
taos_free_result(pRes);
@ -1491,11 +1491,11 @@ int sml_td24070_Test() {
// test stable privilege
taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
pRes = taos_query(taos, "CREATE user test_stb_read pass 'test'");
pRes = taos_query(taos, "CREATE user test_stb_read pass 'test@123'");
ASSERT(taos_errno(pRes) == 0);
taos_free_result(pRes);
pRes = taos_query(taos, "CREATE user test_stb_write pass 'test'");
pRes = taos_query(taos, "CREATE user test_stb_write pass 'test@123'");
ASSERT(taos_errno(pRes) == 0);
taos_free_result(pRes);
@ -1536,11 +1536,11 @@ int sml_td24070_Test() {
// test table privilege
taos = taos_connect("localhost", "root", "taosdata", NULL, 0);
pRes = taos_query(taos, "CREATE user test_tb_read pass 'test'");
pRes = taos_query(taos, "CREATE user test_tb_read pass 'test@123'");
ASSERT(taos_errno(pRes) == 0);
taos_free_result(pRes);
pRes = taos_query(taos, "CREATE user test_tb_write pass 'test'");
pRes = taos_query(taos, "CREATE user test_tb_write pass 'test@123'");
ASSERT(taos_errno(pRes) == 0);
taos_free_result(pRes);