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 11:57:05 +00:00
parent 1553d507e5
commit 03627a142d
22 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tests/army/authorith/authBasic.py
View File

@ -40,9 +40,9 @@ class TDTestCase(TBase):
def test_common_user_privileges(self):
self.prepare_data()
# create user
self.create_user("test", "test")
self.create_user("test", "test12@#*")
# check user 'test' privileges
testconn = taos.connect(user='test', password='test')
testconn = taos.connect(user='test', password='test12@#*')
cursor = testconn.cursor()
testSql = TDSql()
testSql.init(cursor)
@ -87,9 +87,9 @@ class TDTestCase(TBase):
def test_common_user_with_createdb_privileges(self):
self.prepare_data()
# create user
self.create_user("test", "test")
self.create_user("test", "test12@#*")
# check user 'test' privileges
testconn = taos.connect(user='test', password='test')
testconn = taos.connect(user='test', password='test12@#*')
cursor = testconn.cursor()
testSql = TDSql()
testSql.init(cursor)
@ -133,8 +133,8 @@ class TDTestCase(TBase):
testSql.checkRows(2)
# create another user 'test1'
self.create_user("test1", "test1")
test1conn = taos.connect(user='test1', password='test1')
self.create_user("test1", "test12@#*^%")
test1conn = taos.connect(user='test1', password='test12@#*^%')
cursor1 = test1conn.cursor()
test1Sql = TDSql()
test1Sql.init(cursor1)

4
tests/army/cluster/test_drop_table_by_uid.py
View File

@ -305,9 +305,9 @@ class TDTestCase(TBase):
"""
try:
# create new user and grant create database priviledge
tdSql.execute("create user test pass 'test';")
tdSql.execute("create user test pass 'ab45*&TC';")
tdSql.execute("alter user test createdb 1;")
conn = taos.connect(user="test", password="test")
conn = taos.connect(user="test", password="ab45*&TC")
cursor = conn.cursor()
# create database and tables with new user
tdLog.info("Prepare data for test case test_abnormal_drop_table_with_non_root_user")

4
tests/pytest/user/pass_len.py
View File

@ -26,10 +26,10 @@ class TDTestCase:
def run(self):
print("==============step1")
try:
tdSql.execute("create user abc pass '123456'")
tdSql.execute("create user abc pass '123456rf@#'")
except Exception as e:
tdLog.exit(e)
print("create user abc pass '123456'")
print("create user abc pass '123456rf@#'")
print("==============step2")
try:

4
tests/system-test/0-others/subscribe_stream_privilege.py
View File

@ -114,7 +114,7 @@ class TDTestCase:
consumer_dict = {
"group.id": "g1",
"td.connect.user": self.user_name,
"td.connect.pass": "test",
"td.connect.pass": "123456rf@#",
"auto.offset.reset": "earliest"
}
consumer = Consumer(consumer_dict)
@ -167,7 +167,7 @@ class TDTestCase:
def create_user(self):
tdSql.execute(f'create topic {self.topic_name} as database {self.dbnames[0]}')
tdSql.execute(f'create user {self.user_name} pass "test"')
tdSql.execute(f'create user {self.user_name} pass "123456rf@#"')
def run(self):
self.prepare_data()

4
tests/system-test/0-others/taosShell.py
View File

@ -158,7 +158,7 @@ class TDTestCase:
def run(self): # sourcery skip: extract-duplicate-method, remove-redundant-fstring
tdSql.prepare()
# time.sleep(2)
tdSql.query("create user testpy pass 'testpy'")
tdSql.query("create user testpy pass 'testpy243#@'")
tdSql.query("alter user testpy createdb 1")
#hostname = socket.gethostname()
@ -175,7 +175,7 @@ class TDTestCase:
checkNetworkStatus = ['0: unavailable', '1: network ok', '2: service ok', '3: service degraded', '4: exiting']
netrole = ['client', 'server']
keyDict = {'h':'', 'P':'6030', 'p':'testpy', 'u':'testpy', 'a':'', 'A':'', 'c':'', 'C':'', 's':'', 'r':'', 'f':'', \
keyDict = {'h':'', 'P':'6030', 'p':'testpy243#@', 'u':'testpy', 'a':'', 'A':'', 'c':'', 'C':'', 's':'', 'r':'', 'f':'', \
'k':'', 't':'', 'n':'', 'l':'1024', 'N':'100', 'V':'', 'd':'db', 'w':'30', '-help':'', '-usage':'', '?':''}
keyDict['h'] = self.hostname

4
tests/system-test/0-others/taosShellError.py
View File

@ -134,7 +134,7 @@ class TDTestCase:
def run(self): # sourcery skip: extract-duplicate-method, remove-redundant-fstring
tdSql.prepare()
# time.sleep(2)
tdSql.query("create user testpy pass 'testpy'")
tdSql.query("create user testpy pass 'testpy243#@'")
#hostname = socket.gethostname()
#tdLog.info ("hostname: %s" % hostname)
@ -150,7 +150,7 @@ class TDTestCase:
checkNetworkStatus = ['0: unavailable', '1: network ok', '2: service ok', '3: service degraded', '4: exiting']
netrole = ['client', 'server']
keyDict = {'h':'', 'P':'6030', 'p':'testpy', 'u':'testpy', 'a':'', 'A':'', 'c':'', 'C':'', 's':'', 'r':'', 'f':'', \
keyDict = {'h':'', 'P':'6030', 'p':'testpy243#@', 'u':'testpy', 'a':'', 'A':'', 'c':'', 'C':'', 's':'', 'r':'', 'f':'', \
'k':'', 't':'', 'n':'', 'l':'1024', 'N':'100', 'V':'', 'd':'db', 'w':'30', '-help':'', '-usage':'', '?':''}
keyDict['h'] = self.hostname

4
tests/system-test/0-others/taosShellNetChk.py
View File

@ -133,7 +133,7 @@ class TDTestCase:
def run(self): # sourcery skip: extract-duplicate-method, remove-redundant-fstring
tdSql.prepare()
tdSql.query("create user testpy pass 'testpy'")
tdSql.query("create user testpy pass 'testpy243#@'")
buildPath = self.getBuildPath()
if (buildPath == ""):
@ -146,7 +146,7 @@ class TDTestCase:
checkNetworkStatus = ['0: unavailable', '1: network ok', '2: service ok', '3: service degraded', '4: exiting']
netrole = ['client', 'server']
keyDict = {'h':'', 'P':'6030', 'p':'testpy', 'u':'testpy', 'a':'', 'A':'', 'c':'', 'C':'', 's':'', 'r':'', 'f':'', \
keyDict = {'h':'', 'P':'6030', 'p':'testpy243#@', 'u':'testpy', 'a':'', 'A':'', 'c':'', 'C':'', 's':'', 'r':'', 'f':'', \
'k':'', 't':'', 'n':'', 'l':'1024', 'N':'100', 'V':'', 'd':'db', 'w':'30', '-help':'', '-usage':'', '?':''}
keyDict['h'] = self.hostname

2
tests/system-test/0-others/taosdShell.py
View File

@ -132,7 +132,7 @@ class TDTestCase:
def preData(self):
# database\stb\tb\chiild-tb\rows\topics
tdSql.execute("create user testpy pass 'testpy'")
tdSql.execute("create user testpy pass 'testpy243#@'")
tdSql.execute("drop database if exists db0;")
tdSql.execute("create database db0 wal_retention_period 3600;")
tdSql.execute("use db0;")

2
tests/system-test/0-others/taosdlog.py
View File

@ -34,7 +34,7 @@ class TDTestCase:
def run(self): # sourcery skip: extract-duplicate-method, remove-redundant-fstring
tdSql.prepare()
# time.sleep(2)
tdSql.query("create user testpy pass 'testpy'")
tdSql.query("create user testpy pass 't123#$estpy'")
buildPath = self.getBuildPath()
if (buildPath == ""):

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

@ -210,34 +210,34 @@ class TDTestCase:
def create_user_err(self):
sqls = [
"create users u1 pass 'u1passwd' ",
"create user '' pass 'u1passwd' ",
"create user pass 'u1passwd' ",
"create user u1 pass u1passwd ",
"create user u1 password 'u1passwd' ",
"create user u1 pass u1passwd ",
"create users u1 pass 'u1Passwd' ",
"create user '' pass 'u1Passwd' ",
"create user pass 'u1Passwd' ",
"create user u1 pass u1Passwd ",
"create user u1 password 'u1Passwd' ",
"create user u1 pass u1Passwd ",
"create user u1 pass '' ",
"create user u1 pass ' ' ",
"create user u1 pass ",
"create user u1 u2 pass 'u1passwd' 'u2passwd' ",
"create user u1 u2 pass 'u1passwd', 'u2passwd' ",
"create user u1, u2 pass 'u1passwd', 'u2passwd' ",
"create user u1, u2 pass 'u1passwd' 'u2passwd' ",
"create user u1 u2 pass 'u1Passwd' 'u2passwd' ",
"create user u1 u2 pass 'u1Passwd', 'u2passwd' ",
"create user u1, u2 pass 'u1Passwd', 'u2passwd' ",
"create user u1, u2 pass 'u1Passwd' 'u2passwd' ",
# length of user_name must <= 23
"create user u12345678901234567890123 pass 'u1passwd' " ,
"create user u12345678901234567890123 pass 'u1Passwd' " ,
# length of passwd must <= 128
"create user u1 pass 'u12345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678' " ,
# password must have not " ' ~ ` \
"create user u1 pass 'u1passwd\\' " ,
"create user u1 pass 'u1passwd~' " ,
"create user u1 pass 'u1passwd\"' " ,
"create user u1 pass 'u1passwd\'' " ,
"create user u1 pass 'u1passwd`' " ,
"create user u1 pass 'u1Passwd\\' " ,
"create user u1 pass 'u1Passwd~' " ,
"create user u1 pass 'u1Passwd\"' " ,
"create user u1 pass 'u1Passwd\'' " ,
"create user u1 pass 'u1Passwd`' " ,
# must after create a user named u1
"create user u1 pass 'u1passwd' " ,
"create user u1 pass 'u1Passwd' " ,
]
tdSql.execute("create user u1 pass 'u1passwd' ")
tdSql.execute("create user u1 pass 'u1Passwd' ")
for sql in sqls:
tdSql.error(sql)

24
tests/system-test/0-others/user_manage.py
View File

@ -80,16 +80,16 @@ class TDTestCase:
for user_name in ['jiacy1_all', 'jiacy1_read', 'jiacy1_write', 'jiacy1_none', 'jiacy0_all', 'jiacy0_read',
'jiacy0_write', 'jiacy0_none']:
if 'jiacy1' in user_name.lower():
tdSql.execute(f'create user {user_name} pass "123" sysinfo 1')
tdSql.execute(f'create user {user_name} pass "123abc!@#" sysinfo 1')
elif 'jiacy0' in user_name.lower():
tdSql.execute(f'create user {user_name} pass "123" sysinfo 0')
tdSql.execute(f'create user {user_name} pass "123abc!@#" sysinfo 0')
for user_name in ['jiacy1_all', 'jiacy1_read', 'jiacy0_all', 'jiacy0_read']:
tdSql.execute(f'grant read on db to {user_name}')
for user_name in ['jiacy1_all', 'jiacy1_write', 'jiacy0_all', 'jiacy0_write']:
tdSql.execute(f'grant write on db to {user_name}')
def user_privilege_check(self):
jiacy1_read_conn = taos.connect(user='jiacy1_read', password='123')
jiacy1_read_conn = taos.connect(user='jiacy1_read', password='123abc!@#')
sql = "create table ntb (ts timestamp,c0 int)"
expectErrNotOccured = True
try:
@ -107,14 +107,14 @@ class TDTestCase:
pass
def drop_topic(self):
jiacy1_all_conn = taos.connect(user='jiacy1_all', password='123')
jiacy1_read_conn = taos.connect(user='jiacy1_read', password='123')
jiacy1_write_conn = taos.connect(user='jiacy1_write', password='123')
jiacy1_none_conn = taos.connect(user='jiacy1_none', password='123')
jiacy0_all_conn = taos.connect(user='jiacy0_all', password='123')
jiacy0_read_conn = taos.connect(user='jiacy0_read', password='123')
jiacy0_write_conn = taos.connect(user='jiacy0_write', password='123')
jiacy0_none_conn = taos.connect(user='jiacy0_none', password='123')
jiacy1_all_conn = taos.connect(user='jiacy1_all', password='123abc!@#')
jiacy1_read_conn = taos.connect(user='jiacy1_read', password='123abc!@#')
jiacy1_write_conn = taos.connect(user='jiacy1_write', password='123abc!@#')
jiacy1_none_conn = taos.connect(user='jiacy1_none', password='123abc!@#')
jiacy0_all_conn = taos.connect(user='jiacy0_all', password='123abc!@#')
jiacy0_read_conn = taos.connect(user='jiacy0_read', password='123abc!@#')
jiacy0_write_conn = taos.connect(user='jiacy0_write', password='123abc!@#')
jiacy0_none_conn = taos.connect(user='jiacy0_none', password='123abc!@#')
tdSql.execute('create topic root_db as select * from db.stb')
for user in [jiacy1_all_conn, jiacy1_read_conn, jiacy0_all_conn, jiacy0_read_conn]:
user.execute(f'create topic db_jiacy as select * from db.stb')
@ -149,7 +149,7 @@ class TDTestCase:
tdSql.execute('create topic db_topic as select * from db.stb')
tdSql.execute('grant subscribe on db_topic to jiacy1_all')
print("build consumer")
tmq = Consumer({"group.id": "tg2", "td.connect.user": "jiacy1_all", "td.connect.pass": "123",
tmq = Consumer({"group.id": "tg2", "td.connect.user": "jiacy1_all", "td.connect.pass": "123abc!@#",
"enable.auto.commit": "true"})
print("build topic list")
tmq.subscribe(["db_topic"])

8
tests/system-test/0-others/user_privilege.py
View File

@ -58,7 +58,7 @@ class TDTestCase:
self.stbnum_grant = 200
def create_user(self):
tdSql.execute(f'create user {self.user_name} pass "test"')
tdSql.execute(f'create user {self.user_name} pass "test123@#$"')
tdSql.execute(f'grant read on {self.dbnames[0]}.{self.stbname} with t2 = "Beijing" to {self.user_name}')
tdSql.execute(f'grant write on {self.dbnames[1]}.{self.stbname} with t1 = 2 to {self.user_name}')
@ -75,7 +75,7 @@ class TDTestCase:
tdSql.execute(f'create table {self.stbname}_grant_{i} (ts timestamp, c0 int) tags(t0 int)')
def user_read_privilege_check(self, dbname):
testconn = taos.connect(user='test', password='test')
testconn = taos.connect(user='test', password='test123@#$')
expectErrNotOccured = False
try:
@ -94,7 +94,7 @@ class TDTestCase:
pass
def user_write_privilege_check(self, dbname):
testconn = taos.connect(user='test', password='test')
testconn = taos.connect(user='test', password='test123@#$')
expectErrNotOccured = False
try:
@ -110,7 +110,7 @@ class TDTestCase:
pass
def user_privilege_error_check(self):
testconn = taos.connect(user='test', password='test')
testconn = taos.connect(user='test', password='test123@#$')
expectErrNotOccured = False
sql_list = [f"alter talbe {self.dbnames[0]}.stb_1 set t2 = 'Wuhan'",

2
tests/system-test/0-others/user_privilege_all.py
View File

@ -21,7 +21,7 @@ class TDTestCase:
self.setsql = TDSetSql()
# user info
self.username = 'test'
self.password = 'test'
self.password = 'test123@#$'
# db info
self.dbname = "user_privilege_all_db"
self.stbname = 'stb'

2
tests/system-test/0-others/user_privilege_multi_users.py
View File

@ -19,7 +19,7 @@ class TDTestCase:
# user info
self.userNum = 100
self.basic_username = "user"
self.password = "pwd"
self.password = "test123@#$"
# db info
self.dbname = "user_privilege_multi_users"

2
tests/system-test/0-others/user_privilege_show.py
View File

@ -20,7 +20,7 @@ class TDTestCase:
self.setsql = TDSetSql()
# user info
self.username = 'test'
self.password = 'test'
self.password = 'test123@#$'
# db info
self.dbname = "user_privilege_show"
self.stbname = 'stb'

14
tests/system-test/0-others/view/non_marterial_view/test_view.py
View File

@ -231,7 +231,7 @@ class TDTestCase:
"""
self.prepare_data()
username = "view_test"
password = "test"
password = "test123@#$"
self.create_user(username, password)
# grant all db permission to user
tdSql.execute("grant all on view_db.* to view_test;")
@ -271,7 +271,7 @@ class TDTestCase:
"""This test case is used to verify the view permission with db write and view all
"""
username = "view_test"
password = "test"
password = "test123@#$"
self.create_user(username, password)
conn = taos.connect(user=username, password=password)
self.prepare_data(conn)
@ -302,7 +302,7 @@ class TDTestCase:
"""This test case is used to verify the view permission with db write and view read
"""
username = "view_test"
password = "test"
password = "test123@#$"
self.create_user(username, password)
conn = taos.connect(user=username, password=password)
self.prepare_data()
@ -338,7 +338,7 @@ class TDTestCase:
"""This test case is used to verify the view permission with db write and view alter
"""
username = "view_test"
password = "test"
password = "test123@#$"
self.create_user(username, password)
conn = taos.connect(user=username, password=password)
self.prepare_data()
@ -362,7 +362,7 @@ class TDTestCase:
"""This test case is used to verify the view permission with db read and view all
"""
username = "view_test"
password = "test"
password = "test123@#$"
self.create_user(username, password)
conn = taos.connect(user=username, password=password)
self.prepare_data()
@ -388,7 +388,7 @@ class TDTestCase:
"""This test case is used to verify the view permission with db read and view alter
"""
username = "view_test"
password = "test"
password = "test123@#$"
self.create_user(username, password)
conn = taos.connect(user=username, password=password)
self.prepare_data()
@ -413,7 +413,7 @@ class TDTestCase:
"""This test case is used to verify the view permission with db read and view read
"""
username = "view_test"
password = "test"
password = "test123@#$"
self.create_user(username, password)
conn = taos.connect(user=username, password=password)
self.prepare_data()

2
tests/system-test/0-others/walFileIdex.py
View File

@ -40,7 +40,7 @@ class TDTestCase:
def preData(self):
# database\stb\tb\chiild-tb\rows\topics
tdSql.execute("create user testpy pass 'testpy'")
tdSql.execute("create user testpy pass 'test123@#$'")
tdSql.execute("drop database if exists db0;")
tdSql.execute("create database db0 WAL_RETENTION_PERIOD -1 WAL_RETENTION_SIZE -1 ;")
tdSql.execute("use db0;")

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

@ -120,14 +120,14 @@ class TDTestCase:
def username_length_check(self):
username_length = randint(1,self.username_length_boundary-1)
for username in [tdCom.get_long_name(username_length),tdCom.get_long_name(self.username_length_boundary)]:
tdSql.execute(f'create user {username} pass "123"')
tdSql.execute(f'create user {username} pass "test123@#$"')
tdSql.query('show users')
for user in tdSql.queryResult:
if user[0].lower() != 'root':
tdSql.checkEqual(user[0],username)
tdSql.execute(f'drop user {username}')
username = tdCom.get_long_name(self.username_length_boundary+1)
tdSql.error(f'create user {username} pass "123"')
tdSql.error(f'create user {username} pass "test123@#$"')
if "Name or password too long" in tdSql.error_info:
tdLog.info("error info is true!")
else:

4
tests/system-test/2-query/columnLenUpdated.py
View File

@ -104,7 +104,7 @@ class TDTestCase:
def run(self): # sourcery skip: extract-duplicate-method, remove-redundant-fstring
tdSql.prepare()
# time.sleep(2)
tdSql.query("create user testpy pass 'testpy'")
tdSql.query("create user testpy pass 'test123@#$'")
buildPath = self.getBuildPath()
if (buildPath == ""):
@ -117,7 +117,7 @@ class TDTestCase:
checkNetworkStatus = ['0: unavailable', '1: network ok', '2: service ok', '3: service degraded', '4: exiting']
netrole = ['client', 'server']
keyDict = {'h':'', 'P':'6030', 'p':'testpy', 'u':'testpy', 'a':'', 'A':'', 'c':'', 'C':'', 's':'', 'r':'', 'f':'', \
keyDict = {'h':'', 'P':'6030', 'p':'test123@#$', 'u':'testpy', 'a':'', 'A':'', 'c':'', 'C':'', 's':'', 'r':'', 'f':'', \
'k':'', 't':'', 'n':'', 'l':'1024', 'N':'100', 'V':'', 'd':'db', 'w':'30', '-help':'', '-usage':'', '?':''}
keyDict['h'] = self.hostname

2
tests/system-test/2-query/select_null.py
View File

@ -500,7 +500,7 @@ class TDTestCase:
tdSql.execute('create stable sel_null.join_stable(`时间戳` timestamp, c1 int) tags(`标签1` int)', queryTimes=1)
tdSql.query('select a.值 from sel_null.stable1 a join sel_null.join_stable b on a.ts = 时间戳;', queryTimes=1)
tdSql.query('select a.值 from sel_null.stable1 a join sel_null.join_stable b on a.ts = b.时间戳;', queryTimes=1)
tdSql.execute('create user user1 pass "asd"', queryTimes=1)
tdSql.execute('create user user1 pass "asdxtz@#12"', queryTimes=1)
tdSql.execute('grant write on sel_null.stable1 with 标签1 = 1 to user1',queryTimes=1)
tdSql.execute('select count(*) from sel_null.stable1 state_window(值)', queryTimes=1)

2
tests/system-test/6-cluster/5dnode3mnodeRecreateMnode.py
View File

@ -111,7 +111,7 @@ class TDTestCase:
"batchNum": 5000
}
username="user1"
passwd="123"
passwd="test123@#$"
dnodeNumbers=int(dnodeNumbers)
mnodeNums=int(mnodeNums)

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

@ -13,9 +13,9 @@ class TDTestCase:
self.conn = conn
tdSql.init(conn.cursor(), False)
self.passwd = {'root':'taosdata',
'test':'test'}
'test':'test123@#$'}
def prepare_user(self):
tdSql.execute(f"create user test pass 'test' sysinfo 1")
tdSql.execute(f"create user test pass 'test123@#$' sysinfo 1")
def test_connect_user(self, uname):
try:
@ -31,7 +31,7 @@ class TDTestCase:
def run(self):
self.prepare_user()
self.test_connect_user('root')
self.test_connect_user('test')
self.test_connect_user('test123@#$')
def stop(self):
tdSql.close()