Page MenuHomeSoftware Heritage

D3642.diff
No OneTemporary

D3642.diff

diff --git a/swh/storage/tests/test_storage.py b/swh/storage/tests/test_storage.py
--- a/swh/storage/tests/test_storage.py
+++ b/swh/storage/tests/test_storage.py
@@ -1213,53 +1213,51 @@
]
)
- # order asc, no pagination, no limit
+ # order asc, no token, no limit
actual_page = swh_storage.origin_visit_get(origin.url)
assert actual_page.next_page_token is None
- assert actual_page == PagedResult(results=[ov1, ov2, ov3])
+ assert actual_page.results == [ov1, ov2, ov3]
- # order asc, no pagination, limit
+ # order asc, no token, limit
actual_page = swh_storage.origin_visit_get(origin.url, limit=2)
next_page_token = actual_page.next_page_token
assert next_page_token is not None
assert actual_page.results == [ov1, ov2]
- # order asc, pagination, no limit
+ # order asc, token, no limit
actual_page = swh_storage.origin_visit_get(
origin.url, page_token=next_page_token
)
assert actual_page.next_page_token is None
assert actual_page.results == [ov3]
- assert actual_page == PagedResult(results=[ov3])
next_page_token = str(ov1.visit)
actual_page = swh_storage.origin_visit_get(
origin.url, page_token=next_page_token
)
assert actual_page.next_page_token is None
- assert actual_page == PagedResult(results=[ov2, ov3])
+ assert actual_page.results == [ov2, ov3]
- # order asc, pagination, limit
+ # order asc, token, limit
actual_page = swh_storage.origin_visit_get(
origin.url, page_token=next_page_token, limit=2
)
assert actual_page.next_page_token is None
assert actual_page.results == [ov2, ov3]
- assert actual_page == PagedResult(results=[ov2, ov3])
next_page_token = str(ov2.visit)
actual_page = swh_storage.origin_visit_get(
origin.url, page_token=next_page_token, limit=1
)
assert actual_page.next_page_token is None
- assert actual_page == PagedResult(results=[ov3])
+ assert actual_page.results == [ov3]
- # order desc, no pagination, no limit
+ # order desc, no token, no limit
actual_page = swh_storage.origin_visit_get(origin.url, order=ListOrder.DESC)
assert actual_page.next_page_token is None
- assert actual_page == PagedResult(results=[ov3, ov2, ov1])
+ assert actual_page.results == [ov3, ov2, ov1]
- # order desc, no pagination, limit
+ # order desc, no token, limit
actual_page = swh_storage.origin_visit_get(
origin.url, limit=2, order=ListOrder.DESC
)
@@ -1272,17 +1270,16 @@
)
assert actual_page.next_page_token is None
assert actual_page.results == [ov1]
- assert actual_page == PagedResult(results=[ov1])
- # order desc, pagination, no limit
+ # order desc, token, no limit
next_page_token = str(ov3.visit)
actual_page = swh_storage.origin_visit_get(
origin.url, page_token=next_page_token, order=ListOrder.DESC
)
assert actual_page.next_page_token is None
- assert actual_page == PagedResult(results=[ov2, ov1])
+ assert actual_page.results == [ov2, ov1]
- # order desc, pagination, limit
+ # order desc, token, limit
actual_page = swh_storage.origin_visit_get(
origin.url, page_token=next_page_token, order=ListOrder.DESC, limit=1
)
@@ -1293,7 +1290,8 @@
actual_page = swh_storage.origin_visit_get(
origin.url, page_token=next_page_token, order=ListOrder.DESC
)
- assert actual_page == PagedResult(results=[ov1])
+ assert actual_page.next_page_token is None
+ assert actual_page.results == [ov1]
def test_origin_visit_status_get_random(self, swh_storage, sample_data):
origins = sample_data.origins[:2]

File Metadata

Mime Type
text/plain
Expires
Nov 4 2024, 8:52 PM (19 w, 6 d ago)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
3229386

Event Timeline