thevar1able/ClickHouse
1
0
Fork 0
mirror of https://github.com/ClickHouse/ClickHouse.git synced 2024-09-19 16:20:50 +00:00
Code Issues Packages Projects Releases Wiki Activity

tests: make test_distributed_inter_server_secret idempotent

Browse Source 
Signed-off-by: Azat Khuzhin <a.khuzhin@semrush.com>
This commit is contained in:
Azat Khuzhin 2024-08-06 16:59:23 +02:00
parent 0dccc34a20
commit bdfaffa9d7
1 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
tests/integration/test_distributed_inter_server_secret/test.py
View File

@ -46,6 +46,10 @@ users = pytest.mark.parametrize(
)
def generate_query_id():
return str(uuid.uuid4())
def bootstrap():
for n in list(cluster.instances.values()):
n.query("DROP TABLE IF EXISTS data")
@ -268,13 +272,13 @@ def test_secure_insert_buffer_async():
n1.query("SYSTEM RELOAD CONFIG")
# ensure that SELECT creates new connection (we need separate table for
# this, so that separate distributed pool will be used)
query_id = uuid.uuid4().hex
query_id = generate_query_id()
n1.query("SELECT * FROM dist_secure_from_buffer", user="ro", query_id=query_id)
assert n1.contains_in_log(
"{" + query_id + "} <Trace> Connection (n2:9000): Connecting."
)
query_id = uuid.uuid4().hex
query_id = generate_query_id()
n1.query(
"INSERT INTO dist_secure_buffer SELECT * FROM numbers(2)", query_id=query_id
)
@ -331,7 +335,7 @@ def test_secure_disagree_insert():
@users
def test_user_insecure_cluster(user, password):
id_ = "query-dist_insecure-" + user
id_ = "query-dist_insecure-" + user + "-" + generate_query_id()
n1.query(f"SELECT *, '{id_}' FROM dist_insecure", user=user, password=password)
assert get_query_user_info(n1, id_)[0] == [
user,
@ -342,7 +346,7 @@ def test_user_insecure_cluster(user, password):
@users
def test_user_secure_cluster(user, password):
id_ = "query-dist_secure-" + user
id_ = "query-dist_secure-" + user + "-" + generate_query_id()
n1.query(f"SELECT *, '{id_}' FROM dist_secure", user=user, password=password)
assert get_query_user_info(n1, id_)[0] == [user, user]
assert get_query_user_info(n2, id_)[0] == [user, user]
@ -350,7 +354,7 @@ def test_user_secure_cluster(user, password):
@users
def test_per_user_inline_settings_insecure_cluster(user, password):
id_ = "query-ddl-settings-dist_insecure-" + user
id_ = "query-ddl-settings-dist_insecure-" + user + "-" + generate_query_id()
n1.query(
f"""
SELECT *, '{id_}' FROM dist_insecure
@ -367,7 +371,7 @@ def test_per_user_inline_settings_insecure_cluster(user, password):
@users
def test_per_user_inline_settings_secure_cluster(user, password):
id_ = "query-ddl-settings-dist_secure-" + user
id_ = "query-ddl-settings-dist_secure-" + user + "-" + generate_query_id()
n1.query(
f"""
SELECT *, '{id_}' FROM dist_secure
@ -386,7 +390,7 @@ def test_per_user_inline_settings_secure_cluster(user, password):
@users
def test_per_user_protocol_settings_insecure_cluster(user, password):
id_ = "query-protocol-settings-dist_insecure-" + user
id_ = "query-protocol-settings-dist_insecure-" + user + "-" + generate_query_id()
n1.query(
f"SELECT *, '{id_}' FROM dist_insecure",
user=user,
@ -402,7 +406,7 @@ def test_per_user_protocol_settings_insecure_cluster(user, password):
@users
def test_per_user_protocol_settings_secure_cluster(user, password):
id_ = "query-protocol-settings-dist_secure-" + user
id_ = "query-protocol-settings-dist_secure-" + user + "-" + generate_query_id()
n1.query(
f"SELECT *, '{id_}' FROM dist_secure",
user=user,
@ -436,7 +440,7 @@ def test_secure_cluster_distributed_over_distributed_different_users_remote():
def test_secure_cluster_distributed_over_distributed_different_users_cluster():
id_ = "cluster-user"
id_ = "cluster-user" + "-" + generate_query_id()
n1.query(
f"SELECT *, '{id_}' FROM cluster(secure, currentDatabase(), dist_secure)",
user="nopass",