Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

🐛 fixes broken test in servicelib + code deprecation #6216

Merged
merged 3 commits into from
Aug 21, 2024
Merged

🐛 fixes broken test in servicelib + code deprecation #6216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
019b05c
fix broken test
Aug 20, 2024
48ab555
code deprecation
Aug 20, 2024
a1d9330
Merge branch 'master' into pr-osparc-fix-broken-test
GitHK Aug 21, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion packages/service-library/tests/deferred_tasks/test_deferred_tasks.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ async def test_workflow_with_outages_in_process_running_deferred_manager(
*[manager.get_results() for manager in managers]
)
results: list[str] = list(itertools.chain(*gathered_results))
assert len(results) < deferred_tasks_to_start
assert len(results) <= deferred_tasks_to_start

# emulate issues with processing start & stop DeferredManager
for _ in range(start_stop_cycles):
Expand Down
2 changes: 1 addition & 1 deletion services/dynamic-sidecar/tests/mocks/legacy_shared_store.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"compose_spec": null, "container_names": [], "volume_states": {"INPUTS": {"status": "CONTENT_NO_SAVE_REQUIRED", "last_changed": "2023-06-28T07:18:11.157717+00:00"}, "SHARED_STORE": {"status": "CONTENT_NO_SAVE_REQUIRED", "last_changed": "2023-06-28T07:18:11.157741+00:00"}, "OUTPUTS": {"status": "CONTENT_NEEDS_TO_BE_SAVED", "last_changed": "2023-06-28T07:18:11.778735+00:00"}, "STATES": {"status": "CONTENT_NEEDS_TO_BE_SAVED", "last_changed": "2023-06-28T07:18:11.776789+00:00"}}}
{"compose_spec": null, "container_names": [], "volume_states": {"INPUTS": {"status": "CONTENT_NO_SAVE_REQUIRED", "last_changed": "2023-06-28T07:18:11.157717+00:00"}, "SHARED_STORE": {"status": "CONTENT_NO_SAVE_REQUIRED", "last_changed": "2023-06-28T07:18:11.157741+00:00"}, "OUTPUTS": {"status": "CONTENT_NEEDS_TO_BE_SAVED", "last_changed": "2023-06-28T07:18:11.778735+00:00"}, "STATES": {"status": "CONTENT_NEEDS_TO_BE_SAVED", "last_changed": "2023-06-28T07:18:11.776789+00:00"}}, "original_to_container_names": {}}
9 changes: 0 additions & 9 deletions services/dynamic-sidecar/tests/unit/test_models_shared_store.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@
# pylint: disable=unused-argument

import json
import warnings
from copy import deepcopy
from pathlib import Path
from typing import Any
Expand Down Expand Up @@ -122,14 +121,6 @@ async def test_init_from_disk_with_legacy_data_format(project_tests_dir: Path):

# ensure object objects are compatible
parsed_legacy_format = json.loads(disk_shared_store.json())
warnings.warn(
"check notes for deprecation at https://github.com/ITISFoundation/osparc-simcore/issues/4745"
)
# remove properties which have been added but did not exit
# when the legacy format was created
# NOTE this was already parsed so this check is a regression
# to check compatibility with very old formats
parsed_legacy_format.pop("original_to_container_names")

assert parsed_legacy_format == json.loads(
(MOCKS_DIR / LEGACY_SHARED_STORE).read_text()
Expand Down
Loading