Skip to content

Commit da860eb

Browse files
committed
@sanderegg review: rename as paused_container
1 parent 1335665 commit da860eb

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

packages/pytest-simcore/src/pytest_simcore/docker.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@ async def _pause_docker_container_in_context(
4747

4848

4949
@pytest.fixture
50-
async def paused_container_ctx() -> Callable[[str], AbstractAsyncContextManager[None]]:
50+
async def paused_container() -> Callable[[str], AbstractAsyncContextManager[None]]:
5151
@contextlib.asynccontextmanager
5252
async def _(container_name: str) -> AsyncIterator[None]:
5353
async with aiodocker.Docker() as docker_client, _pause_docker_container_in_context(

packages/service-library/tests/deferred_tasks/test_deferred_tasks.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -399,7 +399,7 @@ def mock_default_socket_timeout(mocker: MockerFixture) -> None:
399399
@pytest.mark.parametrize("service", ["rabbit", "redis"])
400400
async def test_workflow_with_third_party_services_outages(
401401
mock_default_socket_timeout: None,
402-
paused_container_ctx: Callable[[str], AbstractAsyncContextManager[None]],
402+
paused_container: Callable[[str], AbstractAsyncContextManager[None]],
403403
redis_client_sdk_deferred_tasks: RedisClientSDK,
404404
rabbit_client: RabbitMQClient,
405405
get_remote_process: Callable[[], Awaitable[_RemoteProcess]],
@@ -410,7 +410,7 @@ async def test_workflow_with_third_party_services_outages(
410410
service: str,
411411
):
412412
service_manager = ServiceManager(
413-
redis_client_sdk_deferred_tasks, rabbit_client, paused_container_ctx
413+
redis_client_sdk_deferred_tasks, rabbit_client, paused_container
414414
)
415415

416416
async with _RemoteProcessLifecycleManager(

packages/service-library/tests/rabbitmq/test_rabbitmq_connection.py

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,12 @@
2727

2828

2929
async def test_rabbit_client_lose_connection(
30-
paused_container_ctx: Callable[[str], AbstractAsyncContextManager[None]],
30+
paused_container: Callable[[str], AbstractAsyncContextManager[None]],
3131
create_rabbitmq_client: Callable[[str], RabbitMQClient],
3232
):
3333
rabbit_client = create_rabbitmq_client("pinger")
3434
assert await rabbit_client.ping() is True
35-
async with paused_container_ctx("rabbit"):
35+
async with paused_container("rabbit"):
3636
# check that connection was lost
3737
async for attempt in AsyncRetrying(
3838
stop=stop_after_delay(15), wait=wait_fixed(0.5), reraise=True
@@ -69,7 +69,7 @@ def _creator(**kwargs: dict[str, Any]) -> PytestRabbitMessage:
6969

7070
@pytest.mark.no_cleanup_check_rabbitmq_server_has_no_errors()
7171
async def test_rabbit_client_with_paused_container(
72-
paused_container_ctx: Callable[[str], AbstractAsyncContextManager[None]],
72+
paused_container: Callable[[str], AbstractAsyncContextManager[None]],
7373
random_exchange_name: Callable[[], str],
7474
random_rabbit_message: Callable[..., PytestRabbitMessage],
7575
create_rabbitmq_client: Callable[[str], RabbitMQClient],
@@ -79,7 +79,7 @@ async def test_rabbit_client_with_paused_container(
7979
exchange_name = random_exchange_name()
8080
message = random_rabbit_message()
8181
await rabbit_client.publish(exchange_name, message)
82-
async with paused_container_ctx("rabbit"):
82+
async with paused_container("rabbit"):
8383
# check that connection was lost
8484
with pytest.raises(asyncio.TimeoutError):
8585
await rabbit_client.publish(exchange_name, message)

packages/service-library/tests/redis/test_client.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,12 +131,12 @@ async def test_redis_client_sdk_setup_shutdown(
131131

132132
async def test_regression_fails_on_redis_service_outage(
133133
mock_redis_socket_timeout: None,
134-
paused_container_ctx: Callable[[str], AbstractAsyncContextManager[None]],
134+
paused_container: Callable[[str], AbstractAsyncContextManager[None]],
135135
redis_client_sdk: RedisClientSDK,
136136
):
137137
assert await redis_client_sdk.ping() is True
138138

139-
async with paused_container_ctx("redis"):
139+
async with paused_container("redis"):
140140
# no connection available any longer should not hang but timeout
141141
assert await redis_client_sdk.ping() is False
142142

services/clusters-keeper/tests/unit/test_modules_rabbitmq.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ async def test_post_message_with_disabled_rabbit_does_not_raise(
136136

137137

138138
async def test_post_message_when_rabbit_disconnected_does_not_raise(
139-
paused_container_ctx: Callable[[str], AbstractAsyncContextManager[None]],
139+
paused_container: Callable[[str], AbstractAsyncContextManager[None]],
140140
enabled_rabbitmq: RabbitSettings,
141141
disabled_ec2: None,
142142
disabled_ssm: None,
@@ -147,6 +147,6 @@ async def test_post_message_when_rabbit_disconnected_does_not_raise(
147147
# NOTE: if the connection is not initialized before pausing the container, then
148148
# this test hangs forever!!! This needs investigations!
149149
await post_message(initialized_app, message=rabbit_log_message)
150-
async with paused_container_ctx("rabbit"):
150+
async with paused_container("rabbit"):
151151
# now posting should not raise out
152152
await post_message(initialized_app, message=rabbit_log_message)

0 commit comments

Comments
 (0)