Skip to content

Commit 2e05671

Browse files
committed
Revert "start adding tests to celery module"
This reverts commit 58e7fa1.
1 parent 738ad55 commit 2e05671

File tree

7 files changed

+37
-65
lines changed

7 files changed

+37
-65
lines changed

packages/celery-library/requirements/_base.txt

Lines changed: 11 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ aiofiles==24.1.0
1010
# via -r requirements/../../../packages/service-library/requirements/_base.in
1111
aiohappyeyeballs==2.6.1
1212
# via aiohttp
13-
aiohttp==3.12.2
13+
aiohttp==3.11.18
1414
# via
1515
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
1616
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
@@ -70,7 +70,7 @@ certifi==2025.4.26
7070
# requests
7171
charset-normalizer==3.4.2
7272
# via requests
73-
click==8.2.1
73+
click==8.1.8
7474
# via
7575
# celery
7676
# click-didyoumean
@@ -97,7 +97,7 @@ exceptiongroup==1.3.0
9797
# via aio-pika
9898
fast-depends==2.4.12
9999
# via faststream
100-
faststream==0.5.42
100+
faststream==0.5.41
101101
# via -r requirements/../../../packages/service-library/requirements/_base.in
102102
frozenlist==1.6.0
103103
# via
@@ -117,7 +117,7 @@ idna==3.10
117117
# yarl
118118
importlib-metadata==8.6.1
119119
# via opentelemetry-api
120-
jsonschema==4.24.0
120+
jsonschema==4.23.0
121121
# via
122122
# -r requirements/../../../packages/models-library/requirements/_base.in
123123
# -r requirements/../../../packages/service-library/requirements/../../../packages/models-library/requirements/_base.in
@@ -129,7 +129,7 @@ markdown-it-py==3.0.0
129129
# via rich
130130
mdurl==0.1.2
131131
# via markdown-it-py
132-
multidict==6.4.4
132+
multidict==6.4.3
133133
# via
134134
# aiohttp
135135
# yarl
@@ -139,7 +139,6 @@ opentelemetry-api==1.33.1
139139
# opentelemetry-exporter-otlp-proto-grpc
140140
# opentelemetry-exporter-otlp-proto-http
141141
# opentelemetry-instrumentation
142-
# opentelemetry-instrumentation-aio-pika
143142
# opentelemetry-instrumentation-logging
144143
# opentelemetry-instrumentation-redis
145144
# opentelemetry-instrumentation-requests
@@ -157,12 +156,9 @@ opentelemetry-exporter-otlp-proto-http==1.33.1
157156
# via opentelemetry-exporter-otlp
158157
opentelemetry-instrumentation==0.54b1
159158
# via
160-
# opentelemetry-instrumentation-aio-pika
161159
# opentelemetry-instrumentation-logging
162160
# opentelemetry-instrumentation-redis
163161
# opentelemetry-instrumentation-requests
164-
opentelemetry-instrumentation-aio-pika==0.54b1
165-
# via -r requirements/../../../packages/service-library/requirements/_base.in
166162
opentelemetry-instrumentation-logging==0.54b1
167163
# via -r requirements/../../../packages/service-library/requirements/_base.in
168164
opentelemetry-instrumentation-redis==0.54b1
@@ -227,7 +223,7 @@ psutil==7.0.0
227223
# via -r requirements/../../../packages/service-library/requirements/_base.in
228224
pycryptodome==3.23.0
229225
# via stream-zip
230-
pydantic==2.11.5
226+
pydantic==2.11.4
231227
# via
232228
# -c requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
233229
# -c requirements/../../../packages/models-library/requirements/../../../packages/common-library/requirements/../../../requirements/constraints.txt
@@ -287,7 +283,7 @@ pydantic-settings==2.7.0
287283
# -r requirements/../../../packages/settings-library/requirements/_base.in
288284
pygments==2.19.1
289285
# via rich
290-
pyinstrument==5.0.2
286+
pyinstrument==5.0.1
291287
# via -r requirements/../../../packages/service-library/requirements/_base.in
292288
pyjwt==2.9.0
293289
# via redis
@@ -351,7 +347,7 @@ rich==14.0.0
351347
# -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
352348
# -r requirements/../../../packages/settings-library/requirements/_base.in
353349
# typer
354-
rpds-py==0.25.1
350+
rpds-py==0.25.0
355351
# via
356352
# jsonschema
357353
# referencing
@@ -371,7 +367,7 @@ toolz==1.0.0
371367
# via -r requirements/../../../packages/service-library/requirements/_base.in
372368
tqdm==4.67.1
373369
# via -r requirements/../../../packages/service-library/requirements/_base.in
374-
typer==0.16.0
370+
typer==0.15.4
375371
# via
376372
# -r requirements/../../../packages/service-library/requirements/../../../packages/settings-library/requirements/_base.in
377373
# -r requirements/../../../packages/settings-library/requirements/_base.in
@@ -389,7 +385,7 @@ typing-extensions==4.13.2
389385
# pydantic-extra-types
390386
# typer
391387
# typing-inspection
392-
typing-inspection==0.4.1
388+
typing-inspection==0.4.0
393389
# via pydantic
394390
tzdata==2025.2
395391
# via kombu
@@ -419,13 +415,12 @@ wrapt==1.17.2
419415
# via
420416
# deprecated
421417
# opentelemetry-instrumentation
422-
# opentelemetry-instrumentation-aio-pika
423418
# opentelemetry-instrumentation-redis
424419
yarl==1.20.0
425420
# via
426421
# -r requirements/../../../packages/service-library/requirements/_base.in
427422
# aio-pika
428423
# aiohttp
429424
# aiormq
430-
zipp==3.22.0
425+
zipp==3.21.0
431426
# via importlib-metadata

packages/celery-library/requirements/_test.in

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
coverage
1313
faker
1414
fastapi
15-
docker
1615
httpx
1716
pint
1817
pytest

packages/celery-library/requirements/_test.txt

Lines changed: 8 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -13,17 +13,10 @@ certifi==2025.4.26
1313
# -c requirements/_base.txt
1414
# httpcore
1515
# httpx
16-
# requests
17-
charset-normalizer==3.4.2
18-
# via
19-
# -c requirements/_base.txt
20-
# requests
21-
coverage==7.8.2
16+
coverage==7.8.0
2217
# via
2318
# -r requirements/_test.in
2419
# pytest-cov
25-
docker==7.1.0
26-
# via -r requirements/_test.in
2720
faker==37.3.0
2821
# via -r requirements/_test.in
2922
fastapi==0.115.12
@@ -47,7 +40,6 @@ idna==3.10
4740
# -c requirements/_base.txt
4841
# anyio
4942
# httpx
50-
# requests
5143
iniconfig==2.1.0
5244
# via pytest
5345
packaging==25.0
@@ -65,7 +57,7 @@ pprintpp==0.4.0
6557
# via pytest-icdiff
6658
py-cpuinfo==9.0.0
6759
# via pytest-benchmark
68-
pydantic==2.11.5
60+
pydantic==2.11.4
6961
# via
7062
# -c requirements/../../../requirements/constraints.txt
7163
# -c requirements/_base.txt
@@ -84,8 +76,10 @@ pytest==8.3.5
8476
# pytest-instafail
8577
# pytest-mock
8678
# pytest-sugar
87-
pytest-asyncio==1.0.0
88-
# via -r requirements/_test.in
79+
pytest-asyncio==0.23.8
80+
# via
81+
# -c requirements/../../../requirements/constraints.txt
82+
# -r requirements/_test.in
8983
pytest-benchmark==5.1.0
9084
# via -r requirements/_test.in
9185
pytest-cov==6.1.1
@@ -94,7 +88,7 @@ pytest-icdiff==0.9
9488
# via -r requirements/_test.in
9589
pytest-instafail==0.5.0
9690
# via -r requirements/_test.in
97-
pytest-mock==3.14.1
91+
pytest-mock==3.14.0
9892
# via -r requirements/_test.in
9993
pytest-runner==6.0.1
10094
# via -r requirements/_test.in
@@ -109,10 +103,6 @@ pyyaml==6.0.2
109103
# -c requirements/../../../requirements/constraints.txt
110104
# -c requirements/_base.txt
111105
# -r requirements/_test.in
112-
requests==2.32.3
113-
# via
114-
# -c requirements/_base.txt
115-
# docker
116106
sniffio==1.3.1
117107
# via
118108
# -c requirements/_base.txt
@@ -134,17 +124,11 @@ typing-extensions==4.13.2
134124
# pydantic
135125
# pydantic-core
136126
# typing-inspection
137-
typing-inspection==0.4.1
127+
typing-inspection==0.4.0
138128
# via
139129
# -c requirements/_base.txt
140130
# pydantic
141131
tzdata==2025.2
142132
# via
143133
# -c requirements/_base.txt
144134
# faker
145-
urllib3==2.4.0
146-
# via
147-
# -c requirements/../../../requirements/constraints.txt
148-
# -c requirements/_base.txt
149-
# docker
150-
# requests

packages/celery-library/requirements/_tools.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ bump2version==1.0.1
88
# via -r requirements/../../../requirements/devenv.txt
99
cfgv==3.4.0
1010
# via pre-commit
11-
click==8.2.1
11+
click==8.1.8
1212
# via
1313
# -c requirements/_base.txt
1414
# black
@@ -19,7 +19,7 @@ distlib==0.3.9
1919
# via virtualenv
2020
filelock==3.18.0
2121
# via virtualenv
22-
identify==2.6.12
22+
identify==2.6.10
2323
# via pre-commit
2424
isort==6.0.1
2525
# via
@@ -67,9 +67,9 @@ pyyaml==6.0.2
6767
# -c requirements/_base.txt
6868
# -c requirements/_test.txt
6969
# pre-commit
70-
ruff==0.11.11
70+
ruff==0.11.10
7171
# via -r requirements/../../../requirements/devenv.txt
72-
setuptools==80.9.0
72+
setuptools==80.7.1
7373
# via pip-tools
7474
tomlkit==0.13.2
7575
# via pylint

packages/celery-library/tests/unit/conftest.py

Whitespace-only changes.

packages/celery-library/tests/unit/test_async_jobs.py renamed to services/storage/tests/unit/test_async_jobs.py

Lines changed: 14 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
import asyncio
55
import pickle
6-
from collections.abc import Awaitable, Callable
6+
from collections.abc import Callable
77
from datetime import timedelta
88
from enum import Enum
99
from typing import Any
@@ -31,6 +31,7 @@
3131
from models_library.users import UserID
3232
from servicelib.rabbitmq import RabbitMQRPCClient, RPCRouter
3333
from servicelib.rabbitmq.rpc_interfaces.async_jobs import async_jobs
34+
from simcore_service_storage.api.rpc.routes import get_rabbitmq_rpc_server
3435
from tenacity import (
3536
AsyncRetrying,
3637
retry_if_exception_type,
@@ -43,12 +44,6 @@
4344
"postgres",
4445
]
4546

46-
pytest_plugins = [
47-
"pytest_simcore.rabbit_service",
48-
"pytest_simcore.docker_compose",
49-
"pytest_simcore.docker_swarm",
50-
"pytest_simcore.repository_paths",
51-
]
5247

5348
###### RPC Interface ######
5449
router = RPCRouter()
@@ -115,12 +110,9 @@ async def async_job(task: Task, task_id: TaskID, action: Action, payload: Any) -
115110

116111

117112
@pytest.fixture
118-
async def rpc_client(
119-
rpc_client: Callable[[str], Awaitable[RabbitMQRPCClient]],
120-
) -> RabbitMQRPCClient:
121-
client = await rpc_client("celery_test_client")
122-
await client.register_router(router, STORAGE_RPC_NAMESPACE)
123-
return client
113+
async def register_rpc_routes(initialized_app: FastAPI) -> None:
114+
rpc_server = get_rabbitmq_rpc_server(initialized_app)
115+
await rpc_server.register_router(router, STORAGE_RPC_NAMESPACE, initialized_app)
124116

125117

126118
async def _start_task_via_rpc(
@@ -208,15 +200,17 @@ async def _wait_for_job(
208200
],
209201
)
210202
async def test_async_jobs_workflow(
211-
rpc_client: RabbitMQRPCClient,
203+
initialized_app: FastAPI,
204+
register_rpc_routes: None,
205+
storage_rabbitmq_rpc_client: RabbitMQRPCClient,
212206
with_storage_celery_worker: CeleryTaskWorker,
213207
user_id: UserID,
214208
product_name: ProductName,
215209
exposed_rpc_start: str,
216210
payload: Any,
217211
):
218212
async_job_get, job_id_data = await _start_task_via_rpc(
219-
rpc_client,
213+
storage_rabbitmq_rpc_client,
220214
rpc_task_name=exposed_rpc_start,
221215
user_id=user_id,
222216
product_name=product_name,
@@ -225,21 +219,21 @@ async def test_async_jobs_workflow(
225219
)
226220

227221
jobs = await async_jobs.list_jobs(
228-
rpc_client,
222+
storage_rabbitmq_rpc_client,
229223
rpc_namespace=STORAGE_RPC_NAMESPACE,
230224
filter_="", # currently not used
231225
job_id_data=job_id_data,
232226
)
233227
assert len(jobs) > 0
234228

235229
await _wait_for_job(
236-
rpc_client,
230+
storage_rabbitmq_rpc_client,
237231
async_job_get=async_job_get,
238232
job_id_data=job_id_data,
239233
)
240234

241235
async_job_result = await async_jobs.result(
242-
rpc_client,
236+
storage_rabbitmq_rpc_client,
243237
rpc_namespace=STORAGE_RPC_NAMESPACE,
244238
job_id=async_job_get.job_id,
245239
job_id_data=job_id_data,
@@ -254,7 +248,7 @@ async def test_async_jobs_workflow(
254248
],
255249
)
256250
async def test_async_jobs_cancel(
257-
# initialized_app: FastAPI,
251+
initialized_app: FastAPI,
258252
register_rpc_routes: None,
259253
storage_rabbitmq_rpc_client: RabbitMQRPCClient,
260254
with_storage_celery_worker: CeleryTaskWorker,
@@ -319,7 +313,7 @@ async def test_async_jobs_cancel(
319313
],
320314
)
321315
async def test_async_jobs_raises(
322-
# initialized_app: FastAPI,
316+
initialized_app: FastAPI,
323317
register_rpc_routes: None,
324318
storage_rabbitmq_rpc_client: RabbitMQRPCClient,
325319
with_storage_celery_worker: CeleryTaskWorker,

0 commit comments

Comments
 (0)