|
15 | 15 | from aiohttp import ClientResponse, ClientSession |
16 | 16 | from aiohttp.test_utils import TestClient, TestServer |
17 | 17 | from aioresponses import aioresponses |
| 18 | +from common_library.json_serialization import json_dumps |
| 19 | +from common_library.serialization import model_dump_with_secrets |
18 | 20 | from common_library.users_enums import UserRole |
19 | 21 | from models_library.projects_state import ProjectShareState, ProjectStatus |
20 | 22 | from pydantic import BaseModel, ByteSize, TypeAdapter |
21 | 23 | from pytest_mock import MockerFixture |
22 | 24 | from pytest_simcore.helpers.assert_checks import assert_status |
| 25 | +from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict |
| 26 | +from pytest_simcore.helpers.typing_env import EnvVarsDict |
23 | 27 | from pytest_simcore.helpers.webserver_users import UserInfoDict |
24 | 28 | from pytest_simcore.pydantic_models import ( |
25 | 29 | assert_validation_model, |
26 | 30 | walk_model_examples_in_package, |
27 | 31 | ) |
28 | 32 | from servicelib.aiohttp import status |
| 33 | +from settings_library.rabbit import RabbitSettings |
29 | 34 | from settings_library.redis import RedisSettings |
30 | 35 | from settings_library.utils_session import DEFAULT_SESSION_COOKIE_NAME |
31 | 36 | from simcore_service_webserver.studies_dispatcher._core import ViewerInfo |
32 | 37 | from simcore_service_webserver.studies_dispatcher._rest_handlers import ServiceGet |
33 | 38 | from sqlalchemy.sql import text |
34 | 39 | from yarl import URL |
35 | 40 |
|
| 41 | +pytest_simcore_core_services_selection = [ |
| 42 | + "rabbit", |
| 43 | +] |
| 44 | + |
36 | 45 | # |
37 | 46 | # FIXTURES OVERRIDES |
38 | 47 | # |
@@ -76,7 +85,25 @@ def postgres_db(postgres_db: sa.engine.Engine) -> sa.engine.Engine: |
76 | 85 |
|
77 | 86 |
|
78 | 87 | @pytest.fixture |
79 | | -def web_server(redis_service: RedisSettings, web_server: TestServer) -> TestServer: |
| 88 | +def app_environment( |
| 89 | + app_environment: EnvVarsDict, |
| 90 | + monkeypatch: pytest.MonkeyPatch, |
| 91 | + rabbit_service: RabbitSettings, |
| 92 | +) -> EnvVarsDict: |
| 93 | + return setenvs_from_dict( |
| 94 | + monkeypatch, |
| 95 | + { |
| 96 | + "WEBSERVER_RABBITMQ": json_dumps( |
| 97 | + model_dump_with_secrets(rabbit_service, show_secrets=True) |
| 98 | + ) |
| 99 | + }, |
| 100 | + ) |
| 101 | + |
| 102 | + |
| 103 | +@pytest.fixture |
| 104 | +def web_server( |
| 105 | + redis_service: RedisSettings, rabbit_service: RabbitSettings, web_server: TestServer |
| 106 | +) -> TestServer: |
80 | 107 | # |
81 | 108 | # Extends web_server to start redis_service |
82 | 109 | # |
|
0 commit comments