Skip to content

Commit 168102a

Browse files
Fix RBAC tests on >=26.1
1 parent 2feb34c commit 168102a

File tree

3 files changed

+22
-5
lines changed

3 files changed

+22
-5
lines changed

rbac/helper/errors.py

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -110,6 +110,17 @@ def cannot_insert_row_policy(name):
110110

111111

112112
def cannot_update_default(self):
113+
if check_clickhouse_version("<23.8")(self):
114+
message = "Exception: Cannot update user `default` in users.xml because this storage is readonly"
115+
else:
116+
message = "Exception: Cannot update user `default` in users_xml because this storage is readonly"
117+
118+
return (
119+
cannot_remove_default_exitcode,
120+
message,
121+
)
122+
123+
def cannot_set_default_role_for_default_user(self):
113124
if check_clickhouse_version(">=26.2")(self):
114125
# PR #88139 changed storage initialization order, causing SET_NON_GRANTED_ROLE (512)
115126
# PR #96841 fixed exit codes to return 255 for server errors

rbac/tests/privileges/create/create_table.py

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1093,11 +1093,17 @@ def create_as_another_table(self, node=None):
10931093
)
10941094

10951095
with And(
1096-
"grant SHOW TABLES privilege on source table to the user"
1096+
"grant SHOW TABLES/COLUMNS privilege on source table to the user"
10971097
):
1098-
node.query(
1099-
f"GRANT SHOW TABLES ON {source_table_name} TO {user_name}"
1100-
)
1098+
# PR #94556: CREATE TABLE ... AS now requires SHOW COLUMNS instead of SHOW TABLES
1099+
if check_clickhouse_version(">=26.1")(self):
1100+
node.query(
1101+
f"GRANT SHOW COLUMNS ON {source_table_name} TO {user_name}"
1102+
)
1103+
else:
1104+
node.query(
1105+
f"GRANT SHOW TABLES ON {source_table_name} TO {user_name}"
1106+
)
11011107
node.query(
11021108
f"CREATE TABLE {table_name} AS {source_table_name}",
11031109
settings=[("user", f"{user_name}")],

rbac/tests/syntax/set_default_role.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -115,7 +115,7 @@ def setup(users=2, roles=2):
115115
requirements=[RQ_SRS_006_RBAC_SetDefaultRole("1.0")],
116116
):
117117
with When("I set a default role for default"):
118-
exitcode, message = errors.cannot_update_default(self)
118+
exitcode, message = errors.cannot_set_default_role_for_default_user(self)
119119
node.query(
120120
"SET DEFAULT ROLE role0 TO default",
121121
exitcode=exitcode,

0 commit comments

Comments
 (0)