bootmode

Author: sanderegg

services/dask-sidecar/tests/unit/conftest.py

@@ -25,6 +25,7 @@
 from pytest_mock.plugin import MockerFixture
 from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
 from pytest_simcore.helpers.typing_env import EnvVarsDict
+from settings_library.rabbit import RabbitSettings
 from settings_library.s3 import S3Settings
 from simcore_service_dask_sidecar.file_utils import _s3fs_settings_from_s3_settings
 from yarl import URL
@@ -81,6 +82,7 @@ def app_environment(
     monkeypatch: pytest.MonkeyPatch,
     env_devel_dict: EnvVarsDict,
     shared_data_folder: Path,
+    rabbit_service: RabbitSettings,
 ) -> EnvVarsDict:
     # configured as worker
     envs = setenvs_from_dict(
@@ -89,6 +91,7 @@ def app_environment(
             # .env-devel
             **env_devel_dict,
             # Variables directly define inside Dockerfile
+            "DASK_WORKER_RABBITMQ": rabbit_service.model_dump_json(),
             "SC_BOOT_MODE": "debug",
             "SIDECAR_LOGLEVEL": "DEBUG",
             "SIDECAR_COMP_SERVICES_SHARED_VOLUME_NAME": "simcore_computational_shared_data",

services/dask-sidecar/tests/unit/test_rabbitmq_plugin.py

@@ -1,8 +1,4 @@
 import distributed
-import pytest
-from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
-from pytest_simcore.helpers.typing_env import EnvVarsDict
-from settings_library.rabbit import RabbitSettings
 
 # Selection of core and tool services started in this swarm fixture (integration)
 pytest_simcore_core_services_selection = [
@@ -12,20 +8,4 @@
 pytest_simcore_ops_services_selection = []
 
 
-@pytest.fixture
-def app_environment(
-    app_environment: EnvVarsDict,
-    monkeypatch: pytest.MonkeyPatch,
-    rabbit_service: RabbitSettings,
-) -> EnvVarsDict:
-    # configured as worker
-    envs = setenvs_from_dict(
-        monkeypatch,
-        {
-            "DASK_WORKER_RABBITMQ": rabbit_service.model_dump_json(),
-        },
-    )
-    return app_environment | envs
-
-
 def test_rabbitmq_plugin_initializes(dask_client: distributed.Client): ...

services/dask-sidecar/tests/unit/test_tasks.py

@@ -60,7 +60,11 @@
 from simcore_service_dask_sidecar.file_utils import _s3fs_settings_from_s3_settings
 from simcore_service_dask_sidecar.worker import run_computational_sidecar
 
-logger = logging.getLogger(__name__)
+_logger = logging.getLogger(__name__)
+
+pytest_simcore_core_services_selection = [
+    "rabbit",
+]
 
 
 @pytest.fixture()
@@ -159,7 +163,10 @@ def _bash_check_env_exist(variable_name: str, variable_value: str) -> list[str]:
     ]
 
 
-@pytest.fixture(params=list(BootMode), ids=str)
+@pytest.fixture(
+    params=list(BootMode),
+    ids=lambda v: f"boot_mode.{v.name}",
+)
 def boot_mode(request: pytest.FixtureRequest) -> BootMode:
     return request.param
 
@@ -443,9 +450,6 @@ def caplog_info_level(
         yield caplog
 
 
-# from pydantic.json_schema import JsonDict
-
-
 @pytest.fixture
 def mocked_get_image_labels(
     integration_version: version.Version, mocker: MockerFixture