diff --git a/tests/storage/dav/servers/radicale/__init__.py b/tests/storage/dav/servers/radicale/__init__.py index 43b3bed..1faf706 100644 --- a/tests/storage/dav/servers/radicale/__init__.py +++ b/tests/storage/dav/servers/radicale/__init__.py @@ -43,6 +43,7 @@ create table property ( storage_backend = os.environ.get('RADICALE_BACKEND', '') or 'filesystem' + def do_the_radicale_dance(tmpdir): # All of radicale is already global state, the cleanliness of the code and # all hope is already lost. This function runs before every test. diff --git a/tests/storage/dav/test_main.py b/tests/storage/dav/test_main.py index b0257fa..1d7a721 100644 --- a/tests/storage/dav/test_main.py +++ b/tests/storage/dav/test_main.py @@ -23,6 +23,7 @@ import requests.exceptions dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale' + def _get_server_mixin(server_name): from . import __name__ as base x = __import__('{}.servers.{}'.format(base, server_name), fromlist=['']) @@ -102,7 +103,6 @@ class DavStorageTests(ServerMixin, StorageTests): super(DavStorageTests, self).test_update_nonexisting() - class TestCaldavStorage(DavStorageTests): storage_class = CaldavStorage @@ -240,12 +240,12 @@ class TestCaldavStorage(DavStorageTests): monkeypatch.setattr('requests.sessions.Session.request', request) with pytest.raises(vdirsyncer.exceptions.StorageError): - s = self.storage_class(**args) + self.storage_class(**args) assert len(calls) == 1 def test_empty_get_multi_performance(self, monkeypatch): s = self._get_storage() - + def breakdown(*a, **kw): raise AssertionError('Expected not to be called.') @@ -253,6 +253,7 @@ class TestCaldavStorage(DavStorageTests): assert list(s.get_multi([])) == [] + class TestCarddavStorage(DavStorageTests): storage_class = CarddavStorage item_template = VCARD_TEMPLATE diff --git a/tests/test_sync.py b/tests/test_sync.py index fa255b0..0d60b6d 100644 --- a/tests/test_sync.py +++ b/tests/test_sync.py @@ -167,6 +167,7 @@ def test_conflict_resolution_new_etags_without_changes(): sync(a, b, status) assert status == {'1': (href_a, etag_a, href_b, etag_b)} + def test_uses_get_multi(monkeypatch): def breakdown(*a, **kw): raise AssertionError('Expected use of get_multi') diff --git a/vdirsyncer/storage/base.py b/vdirsyncer/storage/base.py index 83f89c7..32701ab 100644 --- a/vdirsyncer/storage/base.py +++ b/vdirsyncer/storage/base.py @@ -9,6 +9,7 @@ from .. import exceptions + class Item(object): '''should-be-immutable wrapper class for VCALENDAR and VCARD''' diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py index 17a7fad..4e1c9da 100644 --- a/vdirsyncer/storage/dav.py +++ b/vdirsyncer/storage/dav.py @@ -335,7 +335,7 @@ class CaldavStorage(DavStorage): end = end.strftime(CALDAV_DT_FORMAT) timefilter = ('' - .format(start=start, end=end)) + .format(start=start, end=end)) else: timefilter = ''