Skip to content

Commit 1c3df3d

Browse files
committed
test: remove incremental marker
1 parent f07f066 commit 1c3df3d

File tree

1 file changed

+38
-39
lines changed

1 file changed

+38
-39
lines changed

tests/unit/test_pageiterator.py

Lines changed: 38 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -56,44 +56,43 @@ def side_effect(_, link, **kwargs):
5656
assert req.call_count >= math.ceil(call_count)
5757

5858

59-
@pytest.mark.incremental
60-
class TestPageIterator:
61-
def test_no_paging_required(self):
62-
"""If "next" link not present, current items should be included."""
63-
64-
items = [{"name": "a"}, {"name": "b"}, {"name": "c"}]
65-
obj = RestObj(items=items, count=len(items))
66-
67-
with mock.patch("sasctl.core.request") as req:
68-
pager = PageIterator(obj)
69-
70-
# Returned page of items should preserve item order
71-
items = next(pager)
72-
for idx, item in enumerate(items):
73-
assert item.name == RestObj(items[idx]).name
74-
75-
# No req should have been made to retrieve additional data.
76-
try:
77-
req.assert_not_called()
78-
except AssertionError as e:
79-
raise AssertionError(
80-
f"method_calls={req.mock_calls} call_args={req.call_args_list}"
81-
)
82-
83-
def test_paging_required(self, paging):
84-
"""Requests should be made to retrieve additional pages."""
85-
obj, items, _ = paging
59+
def test_no_paging_required(self):
60+
"""If "next" link not present, current items should be included."""
8661

62+
items = [{"name": "a"}, {"name": "b"}, {"name": "c"}]
63+
obj = RestObj(items=items, count=len(items))
64+
65+
with mock.patch("sasctl.core.request") as req:
8766
pager = PageIterator(obj)
88-
init_count = pager._start
89-
90-
for i, page in enumerate(pager):
91-
for j, item in enumerate(page):
92-
if i == 0:
93-
item_idx = j
94-
else:
95-
# Account for initial page size not necessarily being same size
96-
# as additional pages
97-
item_idx = init_count + (i - 1) * pager._limit + j
98-
target = RestObj(items[item_idx])
99-
assert item.name == target.name
67+
68+
# Returned page of items should preserve item order
69+
items = next(pager)
70+
for idx, item in enumerate(items):
71+
assert item.name == RestObj(items[idx]).name
72+
73+
# No req should have been made to retrieve additional data.
74+
try:
75+
req.assert_not_called()
76+
except AssertionError as e:
77+
raise AssertionError(
78+
f"method_calls={req.mock_calls} call_args={req.call_args_list}"
79+
)
80+
81+
82+
def test_paging_required(self, paging):
83+
"""Requests should be made to retrieve additional pages."""
84+
obj, items, _ = paging
85+
86+
pager = PageIterator(obj)
87+
init_count = pager._start
88+
89+
for i, page in enumerate(pager):
90+
for j, item in enumerate(page):
91+
if i == 0:
92+
item_idx = j
93+
else:
94+
# Account for initial page size not necessarily being same size
95+
# as additional pages
96+
item_idx = init_count + (i - 1) * pager._limit + j
97+
target = RestObj(items[item_idx])
98+
assert item.name == target.name

0 commit comments

Comments
 (0)