refactor tests: remove busy-wait from chaos tests

commit_hash:c08e4c58acb389c86269b89647331bc565a85eb1

Author: vitja

clickhouse/functional_tests/basic_chaos/tests/conftest.py

@@ -46,8 +46,8 @@ async def _gate(gate_settings, clickhouse_conn_info):
 
 @pytest.fixture(name='gate')
 async def _gate_ready(service_client, _gate):
-    _gate.to_client_pass()
-    _gate.to_server_pass()
+    await _gate.to_client_pass()
+    await _gate.to_server_pass()
     _gate.start_accepting()
 
     await _gate.wait_for_connections(timeout=5.0)

clickhouse/functional_tests/basic_chaos/tests/test_clickhouse.py

@@ -36,18 +36,18 @@ async def test_clickhouse_happy(service_client, gate):
 
 
 async def test_clickhouse_disable_reads(service_client, gate):
-    gate.to_server_noop()
+    await gate.to_server_noop()
     result = await service_client.delete('/chaos?key=foo')
     assert result.status == 500
-    gate.to_server_pass()
+    await gate.to_server_pass()
     await _check_that_restores(service_client, gate)
 
 
 async def test_clickhouse_disable_writes(service_client, gate):
-    gate.to_client_noop()
+    await gate.to_client_noop()
     result = await service_client.delete('/chaos?key=foo')
     assert result.status == 500
-    gate.to_client_pass()
+    await gate.to_client_pass()
     await _check_that_restores(service_client, gate)
 
 

core/functional_tests/basic_chaos/tests/httpclient/conftest.py

@@ -32,8 +32,8 @@ def extra_client_deps(_gate_started):
 
 @pytest.fixture(name='gate')
 async def _gate_ready(service_client, _gate_started):
-    _gate_started.to_server_pass()
-    _gate_started.to_client_pass()
+    await _gate_started.to_server_pass()
+    await _gate_started.to_client_pass()
     _gate_started.start_accepting()
     await _gate_started.sockets_close()  # close keepalive connections
 

core/functional_tests/basic_chaos/tests/httpserver/conftest.py

@@ -46,8 +46,8 @@ def extra_client_deps(_gate_started):
 
 @pytest.fixture(name='gate')
 async def _gate_ready(service_client, _gate_started):
-    _gate_started.to_server_pass()
-    _gate_started.to_client_pass()
+    await _gate_started.to_server_pass()
+    await _gate_started.to_client_pass()
     _gate_started.start_accepting()
     await _gate_started.sockets_close()  # close keepalive connections
 

core/functional_tests/basic_chaos/tests/httpserver/test_httpserver.py

@@ -81,8 +81,8 @@ async def _call(
 @pytest.fixture(name='check_restore')
 def _check_restore(gate, call):
     async def _check_restore():
-        gate.to_server_pass()
-        gate.to_client_pass()
+        await gate.to_server_pass()
+        await gate.to_client_pass()
         gate.start_accepting()
 
         response = await call(testsuite_skip_prepare=True)
@@ -237,7 +237,7 @@ async def test_close_on_data(call, gate, check_restore):
     response = await call(testsuite_skip_prepare=True)
     assert response.status == 200
 
-    gate.to_server_close_on_data()
+    await gate.to_server_close_on_data()
 
     assert gate.connections_count() >= 1
     for _ in range(gate.connections_count()):
@@ -249,13 +249,13 @@ async def test_close_on_data(call, gate, check_restore):
 
 @pytest.mark.skip(reason='corrupted data can still be valid')
 async def test_corrupted_request(call, gate, check_restore):
-    gate.to_server_corrupt_data()
+    await gate.to_server_corrupt_data()
 
     response = await call(testsuite_skip_prepare=True)
     assert isinstance(response, http.ClientResponse)
     assert response.status == 400
 
-    gate.to_server_pass()
+    await gate.to_server_pass()
 
     # Connection could be cached in testsuite client. Give it a few attempts
     # to restore
@@ -271,7 +271,7 @@ async def test_partial_request(call, gate, check_restore):
     success: bool = False
     fail: int = 0
     for bytes_count in range(1, 1000):
-        gate.to_server_limit_bytes(bytes_count)
+        await gate.to_server_limit_bytes(bytes_count)
         response = await call(
             data={'test': 'body'},
             testsuite_skip_prepare=True,
@@ -293,7 +293,7 @@ async def test_partial_request(call, gate, check_restore):
 
 
 async def test_network_smaller_parts_sends(call, gate):
-    gate.to_server_smaller_parts(DATA_PARTS_MAX_SIZE)
+    await gate.to_server_smaller_parts(DATA_PARTS_MAX_SIZE)
 
     # With debug enabled in python send works a little bit longer
     response = await call(
@@ -341,7 +341,7 @@ async def test(_data):
     await service_client.update_server_state()
 
     async with handler_metrics:
-        gate.to_server_smaller_parts(
+        await gate.to_server_smaller_parts(
             DATA_PARTS_MAX_SIZE,
             sleep_per_packet=0.03,
         )
@@ -351,7 +351,7 @@ async def test(_data):
         )
         _check_deadline_propagation_response(response)
         assert test.times_called == 0, 'Control flow should NOT enter the handler body'
-        gate.to_server_pass()
+        await gate.to_server_pass()
 
     assert handler_metrics.value_at('rps') == 1
     assert (

core/functional_tests/basic_chaos/tests/resolver/conftest.py

@@ -188,8 +188,8 @@ def extra_client_deps(_gate_started):
 
 @pytest.fixture(name='gate')
 async def _gate_ready(service_client, _gate_started):
-    _gate_started.to_server_pass()
-    _gate_started.to_client_pass()
+    await _gate_started.to_server_pass()
+    await _gate_started.to_client_pass()
     await _gate_started.sockets_close()  # close keepalive connections
 
     yield _gate_started

core/functional_tests/basic_chaos/tests/resolver/test_resolver.py

@@ -72,8 +72,8 @@ async def _do_flush(flush_resolver_cache):
 @pytest.fixture(name='check_restore')
 def _check_restore(gate, call, flush_resolver_cache, gen_domain_name):
     async def _do_restore(domain: typing.Optional[str] = None):
-        gate.to_server_pass()
-        gate.to_client_pass()
+        await gate.to_server_pass()
+        await gate.to_client_pass()
 
         if not domain:
             domain = gen_domain_name()
@@ -105,7 +105,7 @@ async def test_ok(call, gate):
 
 @pytest.mark.skip(reason='corrupted data can still be valid')
 async def test_corrupt_data(call, gate, check_restore):
-    gate.to_client_corrupt_data()
+    await gate.to_client_corrupt_data()
     response = await call()
 
     assert response.status == 500
@@ -119,7 +119,7 @@ async def test_cached_name(call, gate, check_restore, gen_domain_name):
     assert response.status == 200
     assert response.text == SUCCESS_RESOLVE
 
-    gate.to_client_drop()
+    await gate.to_client_drop()
 
     response = await call(resolve=name, check_query=CheckQuery.FROM_CACHE)
     assert response.status == 200
@@ -128,7 +128,7 @@ async def test_cached_name(call, gate, check_restore, gen_domain_name):
 
 @pytest.mark.skip(reason='Fails on c-ares 1.28.1')
 async def test_drop(call, gate, check_restore, gen_domain_name):
-    gate.to_client_drop()
+    await gate.to_client_drop()
 
     response = await call(check_query=CheckQuery.FROM_MOCK)
 
@@ -137,7 +137,7 @@ async def test_drop(call, gate, check_restore, gen_domain_name):
 
 
 async def test_delay(call, gate, check_restore):
-    gate.to_client_delay(delay=10)
+    await gate.to_client_delay(delay=10)
 
     response = await call(timeout=1)
 
@@ -147,7 +147,7 @@ async def test_delay(call, gate, check_restore):
 
 @pytest.mark.skip(reason='Fails on c-ares 1.28.1')
 async def test_close_on_data(call, gate, check_restore):
-    gate.to_client_close_on_data()
+    await gate.to_client_close_on_data()
 
     response = await call()
 
@@ -160,7 +160,7 @@ async def test_close_on_data(call, gate, check_restore):
 
 @pytest.mark.skip(reason='Fails on c-ares 1.28.1')
 async def test_limit_bytes(call, gate, check_restore):
-    gate.to_client_limit_bytes(10)
+    await gate.to_client_limit_bytes(10)
     # 10 bytes less than dns-mock message, so part of this message will be
     # dropped and it must lead error
 

grpc/functional_tests/basic_chaos/tests-grpcclient/conftest.py

@@ -61,8 +61,8 @@ def extra_client_deps(gate):
 
 @pytest.fixture(name='gate')
 async def _gate_ready(_gate_started, greeter_mock):
-    _gate_started.to_server_pass()
-    _gate_started.to_client_pass()
+    await _gate_started.to_server_pass()
+    await _gate_started.to_client_pass()
     _gate_started.start_accepting()
 
     await _gate_started.sockets_close()

grpc/functional_tests/basic_chaos/tests-grpcclient/requests_client.py

@@ -134,8 +134,8 @@ def check_200_for(case):
 
 
 async def close_connection(gate, grpc_ch, service_client):
-    gate.to_server_pass()
-    gate.to_client_pass()
+    await gate.to_server_pass()
+    await gate.to_client_pass()
     await gate.sockets_close()
 
     for _ in range(_RETRIES):

grpc/functional_tests/basic_chaos/tests-grpcclient/test_client_delay.py

@@ -7,8 +7,8 @@
 
 @pytest.mark.parametrize('case', requests_client.ALL_CASES)
 async def test_delay(grpc_ch, service_client, gate, case):
-    gate.to_client_delay(DATA_TRANSMISSION_DELAY)
+    await gate.to_client_delay(DATA_TRANSMISSION_DELAY)
     # client with timeout 1 second
     await requests_client.unavailable_request(service_client, gate, case)
-    gate.to_client_pass()
+    await gate.to_client_pass()
     await requests_client.check_200_for(case)(grpc_ch, service_client, gate)