From f871949d8513e712234ee3358ccb176fb99432ae Mon Sep 17 00:00:00 2001 From: Ilya Yatsishin <2159081+qoega@users.noreply.github.com> Date: Tue, 10 Jan 2023 12:02:33 +0100 Subject: [PATCH 1/2] Try to fix flaky test_create_user_and_login/test.py::test_login_as_dropped_user_xml --- tests/integration/test_create_user_and_login/test.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/integration/test_create_user_and_login/test.py b/tests/integration/test_create_user_and_login/test.py index 1b59089fa11..372fd549b3f 100644 --- a/tests/integration/test_create_user_and_login/test.py +++ b/tests/integration/test_create_user_and_login/test.py @@ -80,7 +80,7 @@ EOF""", ["bash", "-c", "rm /etc/clickhouse-server/users.d/user_c.xml"] ) - expected_errors = ["no user with such name", "not found in user directories"] + expected_errors = ["no user with such name", "not found in user directories", "User has been dropped"] while True: out, err = instance.query_and_get_answer_with_error("SELECT 1", user="C") found_error = [ From 6d6e803cfbfe61fb33b382bdd9f6e006199d6f63 Mon Sep 17 00:00:00 2001 From: robot-clickhouse Date: Tue, 10 Jan 2023 11:09:34 +0000 Subject: [PATCH 2/2] Automatic style fix --- tests/integration/test_create_user_and_login/test.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tests/integration/test_create_user_and_login/test.py b/tests/integration/test_create_user_and_login/test.py index 372fd549b3f..b60ec65cb7b 100644 --- a/tests/integration/test_create_user_and_login/test.py +++ b/tests/integration/test_create_user_and_login/test.py @@ -80,7 +80,11 @@ EOF""", ["bash", "-c", "rm /etc/clickhouse-server/users.d/user_c.xml"] ) - expected_errors = ["no user with such name", "not found in user directories", "User has been dropped"] + expected_errors = [ + "no user with such name", + "not found in user directories", + "User has been dropped", + ] while True: out, err = instance.query_and_get_answer_with_error("SELECT 1", user="C") found_error = [