From 278e7722ed76deda69121ee3fec7491c95f7a66e Mon Sep 17 00:00:00 2001 From: alesapin Date: Tue, 7 Jun 2022 16:09:21 +0200 Subject: [PATCH] Review fix --- .../test_keeper_zookeeper_converter/test.py | 26 +++++++++---------- 1 file changed, 12 insertions(+), 14 deletions(-) diff --git a/tests/integration/test_keeper_zookeeper_converter/test.py b/tests/integration/test_keeper_zookeeper_converter/test.py index 55a4d51227e..72b0d0cdd87 100644 --- a/tests/integration/test_keeper_zookeeper_converter/test.py +++ b/tests/integration/test_keeper_zookeeper_converter/test.py @@ -221,6 +221,16 @@ def get_bytes(s): return s.encode() +def assert_ephemeral_disappear(connection, path): + for _ in range(200): + if not connection.exists(path): + break + + time.sleep(0.1) + else: + raise Exception("ZK refuse to remove ephemeral nodes") + + @pytest.mark.parametrize(("create_snapshots"), [True, False]) def test_simple_crud_requests(started_cluster, create_snapshots): restart_and_clear_zookeeper() @@ -265,13 +275,7 @@ def test_simple_crud_requests(started_cluster, create_snapshots): fake_connection = get_fake_zk(timeout=5) for conn in [genuine_connection, fake_connection]: - for i in range(200): - if not conn.exists("/test_ephemeral/0"): - break - - time.sleep(0.1) - else: - raise Exception("ZK refuse to remove ephemeral nodes") + assert_ephemeral_disappear(conn, "/test_ephemeral/0") # After receiving close request zookeeper updates pzxid of ephemeral parent. # Keeper doesn't receive such request (snapshot created before it) so it doesn't do it. @@ -353,13 +357,7 @@ def test_multi_and_failed_requests(started_cluster, create_snapshots): fake_connection = get_fake_zk(timeout=5) for conn in [genuine_connection, fake_connection]: - for i in range(200): - if not conn.exists("/test_multitransactions/fred0"): - break - - time.sleep(0.1) - else: - raise Exception("ZK refuse to remove ephemeral nodes") + assert_ephemeral_disappear(conn, "/test_multitransactions/fred0") # After receiving close request zookeeper updates pzxid of ephemeral parent. # Keeper doesn't receive such request (snapshot created before it) so it doesn't do it.