Move / clean up update_feeds_iter() tests.

Author: lemon24

tests/fakeparser.py

@@ -29,7 +29,7 @@ class Parser:
 
     should_raise: callable or None = None
     exc: Exception = None
-    is_not_modified: bool = False
+    is_not_modified: callable or None = None
 
     def copy(self):
         return deepcopy(self)
@@ -72,15 +72,15 @@ def raise_exc(self, cond=None, exc=None):
         self.exc = exc or Exception('failing')
         return self
 
-    def not_modified(self):
+    def not_modified(self, cond=lambda _: True):
         self.reset_mode()
-        self.is_not_modified = True
+        self.is_not_modified = cond
         return self
 
     def reset_mode(self):
         self.should_raise = None
         self.exc = None
-        self.is_not_modified = False
+        self.is_not_modified = None
         return self
 
     # parser API
@@ -104,7 +104,7 @@ def retrieve(self, url, caching_info):
                 raise
             except Exception as e:
                 raise ParseError(url) from e
-        if self.is_not_modified:
+        if self.is_not_modified and self.is_not_modified(url):
             raise NotModified(url)
         return nullcontext(RetrievedFeed(BytesIO(b'opaque'), http_info=self.http_info))
 

tests/reader_methods.py

@@ -122,14 +122,17 @@ def update_feed(reader, url):
 
 
 class _update_feeds_iter_methods:
-    def update_feeds_iter(reader):
-        return reader.update_feeds_iter()
+    def update_feeds_iter(reader, **kwargs):
+        return reader.update_feeds_iter(**kwargs)
 
-    def update_feeds_iter_workers(reader):
-        return reader.update_feeds_iter(workers=2)
+    def update_feeds_iter_workers(reader, **kwargs):
+        return reader.update_feeds_iter(workers=2, **kwargs)
 
-    def update_feeds_iter_simulated(reader):
-        for feed in reader.get_feeds(updates_enabled=True, scheduled=True):
+    def update_feeds_iter_simulated(reader, **kwargs):
+        scheduled = True
+        if reader._scheduled_override is not None:
+            kwargs['scheduled'] = reader._scheduled_override
+        for feed in reader.get_feeds(updates_enabled=True, **kwargs):
             try:
                 yield UpdateResult(feed.url, reader.update_feed(feed))
             except UpdateError as e:

tests/test_reader.py

@@ -332,7 +332,7 @@ def test_next_update_after(monkeypatch, now, interval, jitter, random, expected)
     assert next_update_after(now, interval, jitter) == expected
 
 
-def test_update_scheduled(reader, parser, call_update_iter_method):
+def test_update_scheduled(reader, parser, update_feeds_iter):
     one = parser.feed(1)
     two = parser.feed(2)
     three = parser.feed(3)
@@ -343,7 +343,7 @@ def test_update_scheduled(reader, parser, call_update_iter_method):
     reader.set_tag(three, '.reader.update', {'interval': 120, 'jitter': 0.5})
 
     def update():
-        return set(dict(call_update_iter_method(reader, scheduled=True)))
+        return set(dict(update_feeds_iter(reader, scheduled=True)))
 
     reader._now = lambda: datetime(2010, 1, 1)
     assert update() == {'1', '2', '3'}
@@ -485,98 +485,6 @@ def test_set_update_interval_down(reader, parser):
     assert len(list(reader.update_feeds_iter(scheduled=True))) == 1
 
 
-def call_update_feeds_iter(reader, **kwargs):
-    yield from reader.update_feeds_iter(**kwargs)
-
-
-def call_update_feed_iter(reader, **kwargs):
-    for feed in reader.get_feeds(updates_enabled=True, **kwargs):
-        try:
-            yield feed.url, reader.update_feed(feed)
-        except ParseError as e:
-            yield feed.url, e
-
-
-@pytest.fixture(params=[call_update_feeds_iter, call_update_feed_iter])
-def call_update_iter_method(request):
-    return request.param
-
-
-@pytest.mark.noscheduled
-def test_update_feeds_iter(reader, parser, call_update_iter_method):
-    parser.raise_exc(lambda url: url == '3')
-
-    one = parser.feed(1, datetime(2010, 1, 1))
-    one_one = parser.entry(1, 1, datetime(2010, 1, 1))
-    one_two = parser.entry(1, 2, datetime(2010, 2, 1))
-    two = parser.feed(2, datetime(2010, 1, 1))
-    two_one = parser.entry(2, 1, datetime(2010, 2, 1))
-
-    for feed in one, two:
-        reader.add_feed(feed)
-
-    assert dict(call_update_iter_method(reader)) == {
-        '1': UpdatedFeed(url='1', new=2, modified=0),
-        '2': UpdatedFeed(url='2', new=1, modified=0),
-    }
-
-    assert next(call_update_iter_method(reader)) == UpdateResult(
-        '1', UpdatedFeed(url='1', new=0, modified=0, unmodified=2)
-    )
-
-    one_two = parser.entry(1, 2, datetime(2010, 2, 2), title='new title')
-    one_three = parser.entry(1, 3, datetime(2010, 2, 1))
-    one_four = parser.entry(1, 4, datetime(2010, 2, 1))
-    three = parser.feed(3, datetime(2010, 1, 1))
-
-    reader.add_feed(three)
-
-    rv = dict(call_update_iter_method(reader))
-    assert set(rv) == set('123')
-
-    assert rv['1'] == UpdatedFeed(url='1', new=2, modified=1, unmodified=1)
-    assert rv['2'] == UpdatedFeed(url='2', new=0, modified=0, unmodified=1)
-
-    assert isinstance(rv['3'], ParseError)
-    assert rv['3'].url == '3'
-    assert rv['3'].__cause__ is parser.exc
-
-    reader._parser.not_modified()
-
-    assert dict(call_update_iter_method(reader)) == dict.fromkeys('123')
-
-
-@pytest.mark.parametrize('exc_type', [StorageError, Exception])
-def test_update_feeds_iter_raised_exception(
-    reader, parser, exc_type, call_update_iter_method
-):
-    one = parser.feed(1, datetime(2010, 1, 1))
-    two = parser.feed(2, datetime(2010, 1, 1))
-    three = parser.feed(3, datetime(2010, 1, 1))
-
-    for feed in one, two, three:
-        reader.add_feed(feed)
-
-    original_storage_update_feed = reader._storage.update_feed
-
-    def storage_update_feed(intent):
-        if intent.url == '2':
-            raise exc_type('message')
-        return original_storage_update_feed(intent)
-
-    reader._storage.update_feed = storage_update_feed
-
-    rv = {}
-    with pytest.raises(exc_type) as excinfo:
-        rv.update(call_update_iter_method(reader))
-    assert 'message' in str(excinfo.value)
-
-    if not sys.implementation.name == 'pypy':
-        # for some reason, on PyPy the updates sometimes
-        # happen out of order and rv is empty
-        assert rv == {'1': UpdatedFeed(url='1', new=0, modified=0)}
-
-
 def test_mark_as_read_unread(reader, parser, entry_arg):
     # TODO: Test read/unread the same way important/unimportant are (or the other way around).
 

tests/test_reader_update.py

@@ -6,6 +6,7 @@
 """
 
 import logging
+import sys
 import threading
 from contextlib import contextmanager
 from unittest.mock import ANY
@@ -14,6 +15,9 @@
 
 from reader import FeedNotFoundError
 from reader import ParseError
+from reader import StorageError
+from reader import UpdatedFeed
+from reader import UpdateResult
 from utils import Blocking
 from utils import utc_datetime as datetime
 
@@ -411,9 +415,98 @@ def test_last_exception_is_not_reset_by_another_feed(reader, parser):
 # END: update errors
 
 
+# BEGIN: update_feeds_iter()
+
+# TODO: these don't necessarily need the workers= version
+
+
+@pytest.mark.noscheduled
+def test_update_feeds_iter_basic(reader, parser, update_feeds_iter):
+    assert dict(update_feeds_iter(reader)) == {}
+
+    for i in 1, 2:
+        reader.add_feed(parser.feed(i))
+
+    assert dict(update_feeds_iter(reader)) == {
+        '1': UpdatedFeed(url='1'),
+        '2': UpdatedFeed(url='2'),
+    }
+
+    parser.entry(1, 1)
+    parser.entry(1, 2)
+    parser.entry(2, 1)
+
+    assert dict(update_feeds_iter(reader)) == {
+        '1': UpdatedFeed(url='1', new=2),
+        '2': UpdatedFeed(url='2', new=1),
+    }
+
+    parser.entry(1, 2, title='new')
+    parser.entry(1, 3)
+    parser.entry(1, 4)
+
+    assert dict(update_feeds_iter(reader)) == {
+        '1': UpdatedFeed(url='1', new=2, modified=1, unmodified=1),
+        '2': UpdatedFeed(url='2', new=0, modified=0, unmodified=1),
+    }
+
+
+def test_update_feeds_iter_parse_error(reader, parser, update_feeds_iter):
+    for i in 1, 2:
+        reader.add_feed(parser.feed(i))
+    parser.raise_exc(lambda url: url == '1')
+
+    rv = dict(update_feeds_iter(reader))
+
+    assert isinstance(rv['1'], ParseError)
+    assert rv['1'].url == '1'
+    assert rv['1'].__cause__ is parser.exc
+    assert rv['2'] == UpdatedFeed(url='2')
+
+
+def test_update_feeds_iter_not_modified(reader, parser, update_feeds_iter):
+    for i in 1, 2:
+        reader.add_feed(parser.feed(i))
+    parser.not_modified(lambda url: url == '1')
+
+    assert dict(update_feeds_iter(reader)) == {
+        '1': None,
+        '2': UpdatedFeed(url='2'),
+    }
+
+
+@pytest.mark.parametrize('exc_type', [StorageError, Exception])
+def test_update_feeds_iter_unexpected_error(
+    reader, parser, exc_type, update_feeds_iter
+):
+    for i in 1, 2, 3:
+        reader.add_feed(parser.feed(i))
+
+    original_storage_update_feed = reader._storage.update_feed
+    exc = exc_type('message')
+
+    def storage_update_feed(intent):
+        if intent.url == '2':
+            raise exc
+        return original_storage_update_feed(intent)
+
+    reader._storage.update_feed = storage_update_feed
+
+    rv = {}
+    with pytest.raises(exc_type) as excinfo:
+        rv.update(update_feeds_iter(reader))
+    assert excinfo.value is exc
+
+    if 'workers' not in update_feeds_iter.__name__:
+        assert rv == {'1': UpdatedFeed(url='1')}
+
+
+# END: update_feeds_iter()
+
+
 # BEGIN: update_feed()
 
-# return value and ParseError handling covered in test_update_feeds_iter
+# return value and ParseError handling covered in update_feeds_iter() tests
 
 
 def test_update_feed_basic(reader, parser, feed_arg):