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

fix:test case error

This commit is contained in:
wangmm0220 2024-01-25 17:29:55 +08:00
parent 2798ff824c
commit 474514ab66
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/dnode/mnode/impl/src/mndConsumer.c
View File

@ -234,6 +234,7 @@ static int32_t checkPrivilege(SMnode *pMnode, SMqConsumerObj *pConsumer, SMqHbR
continue; continue;
} }
STopicPrivilege *data = taosArrayReserve(rsp->topicPrivileges, 1); STopicPrivilege *data = taosArrayReserve(rsp->topicPrivileges, 1);
strcpy(data->topic, topic);
if (mndCheckTopicPrivilege(pMnode, user, MND_OPER_SUBSCRIBE, pTopic) != 0 || grantCheck(TSDB_GRANT_SUBSCRIBE) < 0) { if (mndCheckTopicPrivilege(pMnode, user, MND_OPER_SUBSCRIBE, pTopic) != 0 || grantCheck(TSDB_GRANT_SUBSCRIBE) < 0) {
data->noPrivilege = 1; data->noPrivilege = 1;
} else{ } else{
@ -320,7 +321,7 @@ static int32_t mndProcessMqHbReq(SRpcMsg *pMsg) {
goto end; goto end;
} }
tSerializeSMqHbRsp(&buf, tlen, &rsp); tSerializeSMqHbRsp(buf, tlen, &rsp);
pMsg->info.rsp = buf; pMsg->info.rsp = buf;
pMsg->info.rspLen = tlen; pMsg->info.rspLen = tlen;

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

@ -22,6 +22,8 @@ from util.sqlset import *
class TDTestCase: class TDTestCase:
clientCfgDict = {'debugFlag': 135}
updatecfgDict = {'debugFlag': 135, 'clientCfg':clientCfgDict}
def init(self, conn, logSql, replicaVar=1): def init(self, conn, logSql, replicaVar=1):
self.replicaVar = int(replicaVar) self.replicaVar = int(replicaVar)
tdLog.debug("start to execute %s" % __file__) tdLog.debug("start to execute %s" % __file__)
@ -61,7 +63,7 @@ class TDTestCase:
def prepare_data(self): def prepare_data(self):
for db in self.dbnames: for db in self.dbnames:
tdSql.execute(f"create database {db}") tdSql.execute(f"create database {db} vgroups 1")
tdSql.execute(f"use {db}") tdSql.execute(f"use {db}")
tdSql.execute(self.setsql.set_create_stable_sql(self.stbname, self.column_dict, self.tag_dict)) tdSql.execute(self.setsql.set_create_stable_sql(self.stbname, self.column_dict, self.tag_dict))
for i in range(self.tbnum): for i in range(self.tbnum):
@ -110,11 +112,9 @@ class TDTestCase:
tdLog.exit(f"grant privilege, should get res") tdLog.exit(f"grant privilege, should get res")
elif cnt == 2: elif cnt == 2:
if res: if res:
time.sleep(1000)
tdLog.exit(f"revoke privilege, should get NULL") tdLog.exit(f"revoke privilege, should get NULL")
else:
else: break
break
tdLog.debug("test subscribe topic privilege revoked by other user") tdLog.debug("test subscribe topic privilege revoked by other user")
tdSql.execute(f'revoke subscribe on {self.topic_name} from {self.user_name}') tdSql.execute(f'revoke subscribe on {self.topic_name} from {self.user_name}')
@ -122,7 +122,6 @@ class TDTestCase:
finally: finally:
consumer.close() consumer.close()
time.sleep(1000)
def create_user(self): def create_user(self):
tdSql.execute(f'create topic {self.topic_name} as database {self.dbnames[0]}') tdSql.execute(f'create topic {self.topic_name} as database {self.dbnames[0]}')