@@ -395,7 +395,22 @@ async def fetch_messages_with_pagination_expect_success(
395
395
396
396
@pytest .mark .asyncio ()
397
397
async def test_pagination (fixture_messages , ccn_api_client ):
398
- sorted_messages_by_time = sorted (fixture_messages , key = lambda msg : msg ["time" ])
398
+ forgotten_messages = list (
399
+ filter (lambda msg : msg ["type" ] == "FORGET" , fixture_messages )
400
+ )
401
+ forgotten_hashes = list (
402
+ itertools .chain .from_iterable (
403
+ [msg ["content" ]["hashes" ] for msg in forgotten_messages ]
404
+ )
405
+ )
406
+
407
+ messages_without_forgotten = list (
408
+ filter (lambda msg : msg ["item_hash" ] not in forgotten_hashes , fixture_messages )
409
+ )
410
+
411
+ sorted_messages_by_time = sorted (
412
+ messages_without_forgotten , key = lambda msg : msg ["time" ]
413
+ )
399
414
400
415
# More messages than available
401
416
messages = await fetch_messages_with_pagination_expect_success (
@@ -427,7 +442,7 @@ async def test_pagination(fixture_messages, ccn_api_client):
427
442
)
428
443
assert_messages_equal (messages , sorted_messages_by_time [- 1 :])
429
444
430
- # Some messages, reverse sort order
445
+ # Some messages, ascending sort order
431
446
messages = await fetch_messages_with_pagination_expect_success (
432
447
ccn_api_client , page = 1 , pagination = 3 , sort_order = 1
433
448
)
0 commit comments