reverted

Author: sanderegg

services/dynamic-sidecar/tests/conftest.py

@@ -28,7 +28,6 @@
     setenvs_from_dict,
     setenvs_from_envfile,
 )
-from pytest_simcore.helpers.postgres_tools import PostgresTestConfig
 from simcore_service_dynamic_sidecar.core.reserved_space import (
     remove_reserved_disk_space,
 )
@@ -151,6 +150,13 @@ def mock_storage_check(mocker: MockerFixture) -> None:
     )
 
 
+@pytest.fixture
+def mock_postgres_check(mocker: MockerFixture) -> None:
+    mocker.patch(
+        "simcore_service_dynamic_sidecar.core.external_dependencies.wait_for_database_liveness",
+    )
+
+
 @pytest.fixture
 def mock_rabbit_check(mocker: MockerFixture) -> None:
     mocker.patch(
@@ -201,8 +207,8 @@ def base_mock_envs(
 
 @pytest.fixture
 def mock_environment(
-    postgres_host_config: PostgresTestConfig,
     mock_storage_check: None,
+    mock_postgres_check: None,
     mock_rabbit_check: None,
     monkeypatch: pytest.MonkeyPatch,
     base_mock_envs: EnvVarsDict,
@@ -243,6 +249,10 @@ def mock_environment(
             "DY_SIDECAR_USER_ID": f"{user_id}",
             "DY_SIDECAR_USER_SERVICES_HAVE_INTERNET_ACCESS": "false",
             "DYNAMIC_SIDECAR_COMPOSE_NAMESPACE": compose_namespace,
+            "POSTGRES_DB": "test",
+            "POSTGRES_HOST": "test",
+            "POSTGRES_PASSWORD": "test",
+            "POSTGRES_USER": "test",
             "R_CLONE_PROVIDER": "MINIO",
             "RABBIT_HOST": "test",
             "RABBIT_PASSWORD": "test",

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

@@ -8,7 +8,6 @@
 from unittest.mock import AsyncMock
 
 import pytest
-import sqlalchemy as sa
 from aiodocker.volumes import DockerVolume
 from async_asgi_testclient import TestClient
 from fastapi import FastAPI
@@ -31,9 +30,17 @@
 logger = logging.getLogger(__name__)
 
 
+#
+# APP and CLIENT fixtures
+#
+#  In this context by default all external services are
+#  mocked (e.g. registry, rabbitmq, ...)
+#
+#
+
+
 @pytest.fixture
 def app(
-    postgres_db: sa.engine.Engine,
     mock_environment: EnvVarsDict,
     mock_registry_service: AsyncMock,
     mock_core_rabbitmq: dict[str, AsyncMock],

services/dynamic-sidecar/tests/unit/test__oas_spec.py

@@ -9,14 +9,6 @@
 from fastapi import FastAPI
 from pytest_simcore.helpers.monkeypatch_envs import EnvVarsDict
 
-pytest_simcore_core_services_selection = [
-    "postgres",
-]
-
-pytest_simcore_ops_services_selection = [
-    "adminer",
-]
-
 
 @pytest.fixture
 def mock_environment(mock_environment_with_envdevel: EnvVarsDict) -> None:

services/dynamic-sidecar/tests/unit/test_api_rest_containers.py

@@ -47,14 +47,6 @@
 from tenacity.stop import stop_after_delay
 from tenacity.wait import wait_fixed
 
-pytest_simcore_core_services_selection = [
-    "postgres",
-]
-
-pytest_simcore_ops_services_selection = [
-    "adminer",
-]
-
 WAIT_FOR_OUTPUTS_WATCHER: Final[float] = 0.1
 FAST_POLLING_INTERVAL: Final[float] = 0.1
 

services/dynamic-sidecar/tests/unit/test_api_rest_containers_long_running_tasks.py

@@ -47,14 +47,6 @@
 from simcore_service_dynamic_sidecar.modules.outputs._context import OutputsContext
 from simcore_service_dynamic_sidecar.modules.outputs._manager import OutputsManager
 
-pytest_simcore_core_services_selection = [
-    "postgres",
-]
-
-pytest_simcore_ops_services_selection = [
-    "adminer",
-]
-
 FAST_STATUS_POLL: Final[float] = 0.1
 CREATE_SERVICE_CONTAINERS_TIMEOUT: Final[float] = 60
 DEFAULT_COMMAND_TIMEOUT: Final[int] = 5

services/dynamic-sidecar/tests/unit/test_api_rest_disk.py

@@ -7,14 +7,6 @@
     _RESERVED_DISK_SPACE_NAME,
 )
 
-pytest_simcore_core_services_selection = [
-    "postgres",
-]
-
-pytest_simcore_ops_services_selection = [
-    "adminer",
-]
-
 
 async def test_reserved_disk_space_freed(
     cleanup_reserved_disk_space: None, test_client: TestClient

services/dynamic-sidecar/tests/unit/test_api_rest_health.py

@@ -7,14 +7,6 @@
     ApplicationHealth,
 )
 
-pytest_simcore_core_services_selection = [
-    "postgres",
-]
-
-pytest_simcore_ops_services_selection = [
-    "adminer",
-]
-
 
 async def test_is_healthy(test_client: TestClient) -> None:
     test_client.application.state.application_health.is_healthy = True

services/dynamic-sidecar/tests/unit/test_api_rest_prometheus_metrics.py

@@ -32,14 +32,6 @@
     UserServicesMetrics,
 )
 
-pytest_simcore_core_services_selection = [
-    "postgres",
-]
-
-pytest_simcore_ops_services_selection = [
-    "adminer",
-]
-
 _FAST_STATUS_POLL: Final[float] = 0.1
 _CREATE_SERVICE_CONTAINERS_TIMEOUT: Final[float] = 60
 

services/dynamic-sidecar/tests/unit/test_api_rest_volumes.py

@@ -9,14 +9,6 @@
 from simcore_service_dynamic_sidecar._meta import API_VTAG
 from simcore_service_dynamic_sidecar.models.shared_store import SharedStore
 
-pytest_simcore_core_services_selection = [
-    "postgres",
-]
-
-pytest_simcore_ops_services_selection = [
-    "adminer",
-]
-
 
 @pytest.mark.parametrize(
     "volume_category, initial_expected_status",

services/dynamic-sidecar/tests/unit/test_api_rest_workflow_service_metrics.py

@@ -49,14 +49,6 @@
 from tenacity.stop import stop_after_delay
 from tenacity.wait import wait_fixed
 
-pytest_simcore_core_services_selection = [
-    "postgres",
-]
-
-pytest_simcore_ops_services_selection = [
-    "adminer",
-]
-
 _FAST_STATUS_POLL: Final[float] = 0.1
 _CREATE_SERVICE_CONTAINERS_TIMEOUT: Final[float] = 60
 _BASE_HEART_BEAT_INTERVAL: Final[float] = 0.1