Don't assume 'next' appears last.
This commit is contained in:
parent
cb6c6b814e
commit
895620b536
@ -211,7 +211,7 @@ def qute_history(url):
|
|||||||
last_item = item
|
last_item = item
|
||||||
continue
|
continue
|
||||||
if item_newer:
|
if item_newer:
|
||||||
yield {"next": int(last_item.atime)}
|
yield {"next": int(last_item.atime if last_item else -1)}
|
||||||
return
|
return
|
||||||
|
|
||||||
# Use item's url as title if there's no title.
|
# Use item's url as title if there's no title.
|
||||||
|
@ -110,10 +110,10 @@ class TestHistoryHandler:
|
|||||||
fake_web_history.save()
|
fake_web_history.save()
|
||||||
|
|
||||||
@pytest.mark.parametrize("start_time_offset, expected_item_count", [
|
@pytest.mark.parametrize("start_time_offset, expected_item_count", [
|
||||||
(0, 5),
|
(0, 4),
|
||||||
(24*60*60, 5),
|
(24*60*60, 4),
|
||||||
(48*60*60, 5),
|
(48*60*60, 4),
|
||||||
(72*60*60, 1)
|
(72*60*60, 0)
|
||||||
])
|
])
|
||||||
def test_qutehistory_data(self, start_time_offset, expected_item_count):
|
def test_qutehistory_data(self, start_time_offset, expected_item_count):
|
||||||
"""Ensure qute://history/data returns correct items."""
|
"""Ensure qute://history/data returns correct items."""
|
||||||
@ -121,12 +121,13 @@ class TestHistoryHandler:
|
|||||||
url = QUrl("qute://history/data?start_time=" + str(start_time))
|
url = QUrl("qute://history/data?start_time=" + str(start_time))
|
||||||
_mimetype, data = qutescheme.qute_history(url)
|
_mimetype, data = qutescheme.qute_history(url)
|
||||||
items = json.loads(data)
|
items = json.loads(data)
|
||||||
|
items = [item for item in items if 'time' in item] # skip 'next' item
|
||||||
|
|
||||||
assert len(items) == expected_item_count
|
assert len(items) == expected_item_count
|
||||||
|
|
||||||
# test times
|
# test times
|
||||||
end_time = start_time - 24*60*60
|
end_time = start_time - 24*60*60
|
||||||
for item in items[:expected_item_count-1]:
|
for item in items:
|
||||||
assert item['time'] <= start_time
|
assert item['time'] <= start_time
|
||||||
assert item['time'] > end_time
|
assert item['time'] > end_time
|
||||||
|
|
||||||
@ -142,6 +143,7 @@ class TestHistoryHandler:
|
|||||||
url = QUrl("qute://history/data?start_time=" + str(start_time))
|
url = QUrl("qute://history/data?start_time=" + str(start_time))
|
||||||
_mimetype, data = qutescheme.qute_history(url)
|
_mimetype, data = qutescheme.qute_history(url)
|
||||||
items = json.loads(data)
|
items = json.loads(data)
|
||||||
|
items = [item for item in items if 'next' in item] # 'next' items
|
||||||
|
|
||||||
if next_time == -1:
|
if next_time == -1:
|
||||||
assert items[-1]["next"] == -1
|
assert items[-1]["next"] == -1
|
||||||
|
Loading…
Reference in New Issue
Block a user