Skip to content

Commit e526df5

Browse files
author
Andrei Neagu
committed
Revert "fixed tests"
This reverts commit 9fbf1cf.
1 parent 9fbf1cf commit e526df5

File tree

3 files changed

+2
-21
lines changed

3 files changed

+2
-21
lines changed

services/director-v2/tests/unit/test_api_route_dynamic_scheduler.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from models_library.service_settings_labels import SimcoreServiceLabels
1616
from pytest_mock.plugin import MockerFixture
1717
from pytest_simcore.helpers.typing_env import EnvVarsDict
18-
from settings_library.redis import RedisSettings
1918
from simcore_service_director_v2.models.dynamic_services_scheduler import SchedulerData
2019
from simcore_service_director_v2.modules.dynamic_sidecar.errors import (
2120
DynamicSidecarNotFoundError,
@@ -25,17 +24,12 @@
2524
)
2625
from starlette.testclient import TestClient
2726

28-
pytest_simcore_core_services_selection = [
29-
"redis",
30-
]
31-
3227

3328
@pytest.fixture
3429
def mock_env(
3530
mock_exclusive: None,
3631
disable_rabbitmq: None,
3732
disable_postgres: None,
38-
redis_service: RedisSettings,
3933
mock_env: EnvVarsDict,
4034
monkeypatch: pytest.MonkeyPatch,
4135
docker_swarm: None,

services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler.py

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
from pytest_mock.plugin import MockerFixture
2424
from pytest_simcore.helpers.typing_env import EnvVarsDict
2525
from respx.router import MockRouter
26-
from settings_library.redis import RedisSettings
2726
from simcore_service_director_v2.models.dynamic_services_scheduler import (
2827
DockerContainerInspect,
2928
DynamicSidecarStatus,
@@ -57,13 +56,8 @@
5756
log = logging.getLogger(__name__)
5857

5958

60-
pytest_simcore_core_services_selection = [
61-
"postgres",
62-
"redis",
63-
]
64-
pytest_simcore_ops_services_selection = [
65-
"adminer",
66-
]
59+
pytest_simcore_core_services_selection = ["postgres"]
60+
pytest_simcore_ops_services_selection = ["adminer"]
6761

6862

6963
def get_url(dynamic_sidecar_endpoint: str, postfix: str) -> str:
@@ -134,7 +128,6 @@ def mock_env(
134128
disable_postgres: None,
135129
disable_rabbitmq: None,
136130
mock_env: EnvVarsDict,
137-
redis_service: RedisSettings,
138131
monkeypatch: pytest.MonkeyPatch,
139132
simcore_services_network_name: str,
140133
mock_docker_api: None,

services/director-v2/tests/unit/test_modules_dynamic_sidecar_scheduler_task.py

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
from pytest_simcore.helpers.monkeypatch_envs import setenvs_from_dict
2121
from pytest_simcore.helpers.typing_env import EnvVarsDict
2222
from respx.router import MockRouter
23-
from settings_library.redis import RedisSettings
2423
from simcore_service_director_v2.models.dynamic_services_scheduler import SchedulerData
2524
from simcore_service_director_v2.modules.dynamic_sidecar.api_client._public import (
2625
SidecarsClient,
@@ -39,10 +38,6 @@
3938
DynamicSidecarsScheduler,
4039
)
4140

42-
pytest_simcore_core_services_selection = [
43-
"redis",
44-
]
45-
4641
SCHEDULER_INTERVAL_SECONDS: Final[float] = 0.1
4742

4843

@@ -51,7 +46,6 @@ def mock_env(
5146
disable_postgres: None,
5247
disable_rabbitmq: None,
5348
mock_env: EnvVarsDict,
54-
redis_service: RedisSettings,
5549
monkeypatch: pytest.MonkeyPatch,
5650
simcore_services_network_name: str,
5751
docker_swarm: None,

0 commit comments

Comments
 (0)