From 2b2499b3e4ec786e468651e045e19d45c1e20fbc Mon Sep 17 00:00:00 2001 From: Andrei Neagu Date: Thu, 11 Aug 2022 16:08:08 +0200 Subject: [PATCH 1/2] fixed issue with flaky tests --- .../docker_service_specs/sidecar.py | 4 ++-- ...es_dynamic_sidecar_docker_service_specs.py | 20 ++++++++++++++++++- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py b/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py index 67f1d5259b4..352f7a3bb9c 100644 --- a/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py +++ b/services/director-v2/src/simcore_service_director_v2/modules/dynamic_sidecar/docker_service_specs/sidecar.py @@ -46,9 +46,9 @@ def _get_environment_variables( "DY_SIDECAR_PATH_OUTPUTS": f"{scheduler_data.paths_mapping.outputs_path}", "DY_SIDECAR_PROJECT_ID": f"{scheduler_data.project_id}", "DY_SIDECAR_RUN_ID": f"{scheduler_data.dynamic_sidecar.run_id}", - "DY_SIDECAR_STATE_EXCLUDE": json_dumps([f"{x}" for x in state_exclude]), + "DY_SIDECAR_STATE_EXCLUDE": json_dumps(f"{x}" for x in state_exclude), "DY_SIDECAR_STATE_PATHS": json_dumps( - [f"{x}" for x in scheduler_data.paths_mapping.state_paths] + f"{x}" for x in scheduler_data.paths_mapping.state_paths ), "DY_SIDECAR_USER_ID": f"{scheduler_data.user_id}", "DYNAMIC_SIDECAR_COMPOSE_NAMESPACE": compose_namespace, diff --git a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py index c689b040a71..dd02c3f0faf 100644 --- a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py +++ b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py @@ -190,7 +190,7 @@ def expected_dynamic_sidecar_spec(run_id: UUID) -> dict[str, Any]: "DY_SIDECAR_PATH_INPUTS": "/tmp/inputs", "DY_SIDECAR_PATH_OUTPUTS": "/tmp/outputs", "DY_SIDECAR_PROJECT_ID": "dd1d04d9-d704-4f7e-8f0f-1ca60cc771fe", - "DY_SIDECAR_STATE_EXCLUDE": json_dumps(["/tmp/strip_me/*", "*.py"]), + "DY_SIDECAR_STATE_EXCLUDE": json_dumps({"*.py", "/tmp/strip_me/*"}), "DY_SIDECAR_STATE_PATHS": json_dumps( ["/tmp/save_1", "/tmp_save_2"] ), @@ -360,6 +360,24 @@ def test_get_dynamic_proxy_spec( "TaskTemplate": {"ContainerSpec": {"Env": True}}, } + # NOTE: some falkyness here + # state_exclude is a set and does not preserve order + # when dumping to json it gets converted to a list + dynamic_sidecar_spec.TaskTemplate.ContainerSpec.Env[ + "DY_SIDECAR_STATE_EXCLUDE" + ] = sorted( + dynamic_sidecar_spec.TaskTemplate.ContainerSpec.Env[ + "DY_SIDECAR_STATE_EXCLUDE" + ] + ) + expected_dynamic_sidecar_spec_model.TaskTemplate.ContainerSpec.Env[ + "DY_SIDECAR_STATE_EXCLUDE" + ] = sorted( + expected_dynamic_sidecar_spec_model.TaskTemplate.ContainerSpec.Env[ + "DY_SIDECAR_STATE_EXCLUDE" + ] + ) + assert dynamic_sidecar_spec.dict( exclude=exclude_keys ) == expected_dynamic_sidecar_spec_model.dict(exclude=exclude_keys) From 9042d6292c42231f22d4dccd46339f085251e8c6 Mon Sep 17 00:00:00 2001 From: Sylvain <35365065+sanderegg@users.noreply.github.com> Date: Thu, 11 Aug 2022 18:24:01 +0200 Subject: [PATCH 2/2] Update services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py --- .../unit/test_modules_dynamic_sidecar_docker_service_specs.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py index dd02c3f0faf..8df73625fed 100644 --- a/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py +++ b/services/director-v2/tests/unit/test_modules_dynamic_sidecar_docker_service_specs.py @@ -360,7 +360,7 @@ def test_get_dynamic_proxy_spec( "TaskTemplate": {"ContainerSpec": {"Env": True}}, } - # NOTE: some falkyness here + # NOTE: some flakiness here # state_exclude is a set and does not preserve order # when dumping to json it gets converted to a list dynamic_sidecar_spec.TaskTemplate.ContainerSpec.Env[