Skip to content

Commit c70fb6d

Browse files
authored
Merge branch 'master' into fix/do-not-list-deprecated
2 parents 3bd9e86 + bb3b81c commit c70fb6d

File tree

3 files changed

+3
-15
lines changed

3 files changed

+3
-15
lines changed

services/docker-compose.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1207,7 +1207,7 @@ services:
12071207
<<: *storage_environment
12081208
STORAGE_WORKER_MODE: "true"
12091209
CELERY_CONCURRENCY: 1
1210-
CELERY_QUEUES: "cpu-bound"
1210+
CELERY_QUEUES: "cpu_bound"
12111211
networks: *storage_networks
12121212

12131213
rabbit:

services/storage/tests/conftest.py

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1018,12 +1018,8 @@ async def with_storage_celery_worker_controller(
10181018
perform_ping_check=False,
10191019
queues="default,cpu_bound",
10201020
) as worker:
1021-
worker_init.send(sender=worker)
1022-
10231021
yield worker
10241022

1025-
worker_shutdown.send(sender=worker)
1026-
10271023

10281024
@pytest.fixture
10291025
def with_storage_celery_worker(

services/storage/tests/unit/test_async_jobs.py

Lines changed: 2 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -195,7 +195,7 @@ async def _wait_for_job(
195195
{"a", "set"},
196196
],
197197
)
198-
async def test_asybc_jobs_workflow(
198+
async def test_async_jobs_workflow(
199199
initialized_app: FastAPI,
200200
register_rpc_routes: None,
201201
storage_rabbitmq_rpc_client: RabbitMQRPCClient,
@@ -241,15 +241,7 @@ async def test_asybc_jobs_workflow(
241241
"exposed_rpc_start",
242242
[
243243
rpc_sync_job.__name__,
244-
pytest.param(
245-
rpc_async_job.__name__,
246-
marks=pytest.mark.skip(
247-
reason=(
248-
"hangs after teardown for unknown reason "
249-
"SEE https://github.com/ITISFoundation/osparc-simcore/issues/7486"
250-
)
251-
),
252-
),
244+
rpc_async_job.__name__,
253245
],
254246
)
255247
async def test_async_jobs_cancel(

0 commit comments

Comments
 (0)