Skip to content

Commit c62939b

Browse files
committed
Update for backend 3.20
1 parent 5752841 commit c62939b

File tree

3 files changed

+16
-6
lines changed

3 files changed

+16
-6
lines changed

src/scitacean/testing/backend/docker-compose-backend-template.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ services:
1616
- "27017:27017"
1717

1818
scicat:
19-
image: ghcr.io/scicatproject/backend-next:v4.8.0
19+
image: ghcr.io/scicatproject/backend-next:v4.20.2
2020
container_name: scitacean-test-scicat
2121
depends_on:
2222
- mongodb

tests/client/attachment_client_test.py

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,12 @@ def compare_attachment_after_upload(
6666
assert expected == dict(downloaded)[key], f"key = {key}"
6767

6868

69+
def sorted_attachments(
70+
attachments: list[DownloadAttachment],
71+
) -> list[DownloadAttachment]:
72+
return sorted(attachments, key=lambda a: a.id)
73+
74+
6975
def test_create_attachment_for_dataset(
7076
scicat_client: ScicatClient,
7177
attachment: UploadAttachment,
@@ -140,7 +146,9 @@ def test_create_attachment_for_dataset_for_dataset_populates_ids(
140146
def test_get_attachments_for_dataset(scicat_client: ScicatClient) -> None:
141147
dset = INITIAL_DATASETS["derived"]
142148
attachments = scicat_client.get_attachments_for_dataset(dset.pid)
143-
assert attachments == INITIAL_ATTACHMENTS["derived"]
149+
assert sorted_attachments(attachments) == sorted_attachments(
150+
INITIAL_ATTACHMENTS["derived"]
151+
)
144152

145153

146154
def test_get_attachments_for_dataset_no_attachments(
@@ -168,7 +176,9 @@ def test_download_attachments_for_dataset(client: Client, key: str) -> None:
168176
Attachment.from_download_model(attachment)
169177
for attachment in INITIAL_ATTACHMENTS.get(key, ())
170178
]
171-
assert with_attachments.attachments == expected
179+
assert sorted_attachments(with_attachments.attachments) == sorted_attachments(
180+
expected
181+
)
172182

173183

174184
@pytest.mark.parametrize("key", ["raw", "derived"])
@@ -179,4 +189,4 @@ def test_get_dataset_with_attachments(client: Client, key: str) -> None:
179189
Attachment.from_download_model(attachment)
180190
for attachment in INITIAL_ATTACHMENTS.get(key, ())
181191
]
182-
assert downloaded.attachments == expected
192+
assert sorted_attachments(downloaded.attachments) == sorted_attachments(expected)

tests/model_test.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ def test_derived_dataset_default_values(
153153
assert finalized.size == 0
154154
assert finalized.techniques == []
155155
assert finalized.updatedAt # some non-empty str
156-
assert finalized.version == "v3"
156+
assert finalized.version == "3"
157157

158158
# Left empty
159159
assert finalized.description is None is None
@@ -222,7 +222,7 @@ def test_raw_dataset_default_values(
222222
assert finalized.size == 0
223223
assert finalized.techniques == []
224224
assert finalized.updatedAt # some non-empty str
225-
assert finalized.version == "v3"
225+
assert finalized.version == "3"
226226

227227
# Left empty
228228
assert finalized.dataFormat is None

0 commit comments

Comments
 (0)