Skip to content

Commit 56868ea

Browse files
committed
improve fixture
1 parent f1426a5 commit 56868ea

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

clients/python/test/e2e/test_files_api.py

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88
from pathlib import Path
99

1010
import osparc
11+
from osparc._utils import PaginationIterator
1112
import pytest
1213
from memory_profiler import memory_usage
1314
from typing import Final, List, Callable
@@ -96,7 +97,7 @@ def test_search_files(
9697
use_id: bool,
9798
faker: Faker,
9899
) -> None:
99-
results: osparc.PaginationGenerator = files_api._search_files(
100+
results: PaginationIterator = files_api._search_files(
100101
sha256_checksum=f"{faker.sha256()}"
101102
)
102103
assert len(results) == 0, "Found file which shouldn't be there"
@@ -108,5 +109,5 @@ def test_search_files(
108109
else None,
109110
)
110111
assert len(results) == 1, "Could not find file after it had been uploaded"
111-
for file in results:
112-
assert file.checksum == large_server_file.server_file.checksum
112+
file = next(results)
113+
assert file.checksum == large_server_file.server_file.checksum

clients/python/test/test_osparc/conftest.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def page_file(faker: Faker) -> osparc.PageFile:
3838

3939
return osparc.PageFile(
4040
items=items,
41-
total=faker.pyint(min_value=1, max_value=10) * len(items),
41+
total=faker.pyint(min_value=len(items) + 1, max_value=len(items) + 100),
4242
limit=len(items),
4343
offset=faker.pyint(min_value=0),
4444
links=osparc.Links(next=faker.url()),

clients/python/test/test_osparc/test_basic.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,10 @@ def test_pagination_iterator(
106106
)
107107

108108
def _sideeffect(all_items: List, request: httpx.Request):
109-
if len(all_items) > faker.pyint(min_value=10):
110-
page_file.links.next = None
111109
all_items += page_file.items
110+
if len(all_items) >= page_file.total:
111+
all_items = all_items[: page_file.total]
112+
page_file.links.next = None
112113
return httpx.Response(status_code=200, json=page_file.to_dict())
113114

114115
with respx.mock(

0 commit comments

Comments
 (0)