sjs/vdirsyncer
1
0
Fork 0
mirror of https://github.com/samsonjs/vdirsyncer.git synced 2026-04-04 10:35:51 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Use more fixtures

Browse source
This commit is contained in:
Markus Unterwaditzer 2014-07-06 23:22:02 +02:00
parent 29ba12cf19
commit c750561fb8
6 changed files with 65 additions and 76 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
tests/storage/__init__.py
View file

@ -20,22 +20,31 @@ from .. import SIMPLE_TEMPLATE, assert_item_equals
class BaseStorageTests(object):
item_template = SIMPLE_TEMPLATE
@pytest.fixture
def storage_args(self):
return self.get_storage_args
def get_storage_args(self, collection=None):
raise NotImplementedError()
@pytest.fixture
def storage(self, storage_args):
def inner(**kw):
return self.storage_class(**storage_args(**kw))
return inner
@pytest.fixture
def s(self, storage):
return storage()
def _create_bogus_item(self, item_template=None):
r = random.random()
item_template = item_template or self.item_template
return Item(item_template.format(r=r))
def get_storage_args(self, collection=None):
raise NotImplementedError()
def _get_storage(self):
s = self.storage_class(**self.get_storage_args())
assert not list(s.list())
return s
def test_generic(self):
def test_generic(self, s):
items = [self._create_bogus_item() for i in range(1, 10)]
s = self._get_storage()
hrefs = []
for item in items:
hrefs.append(s.upload(item))
@ -48,25 +57,21 @@ class BaseStorageTests(object):
item, etag2 = s.get(href)
assert etag == etag2
def test_empty_get_multi(self):
s = self._get_storage()
def test_empty_get_multi(self, s):
assert list(s.get_multi([])) == []
def test_upload_already_existing(self):
s = self._get_storage()
def test_upload_already_existing(self, s):
item = self._create_bogus_item()
s.upload(item)
with pytest.raises(exceptions.PreconditionFailed):
s.upload(item)
def test_upload(self):
s = self._get_storage()
def test_upload(self, s):
item = self._create_bogus_item()
href, etag = s.upload(item)
assert_item_equals(s.get(href)[0], item)
def test_update(self):
s = self._get_storage()
def test_update(self, s):
item = self._create_bogus_item()
href, etag = s.upload(item)
assert_item_equals(s.get(href)[0], item)
@ -77,16 +82,14 @@ class BaseStorageTests(object):
assert isinstance(new_etag, (bytes, text_type))
assert_item_equals(s.get(href)[0], new_item)
def test_update_nonexisting(self):
s = self._get_storage()
def test_update_nonexisting(self, s):
item = self._create_bogus_item()
with pytest.raises(exceptions.PreconditionFailed):
s.update(s._get_href(item), item, '"123"')
with pytest.raises(exceptions.PreconditionFailed):
s.update('huehue', item, '"123"')
def test_wrong_etag(self):
s = self._get_storage()
def test_wrong_etag(self, s):
item = self._create_bogus_item()
href, etag = s.upload(item)
with pytest.raises(exceptions.PreconditionFailed):
@ -94,32 +97,27 @@ class BaseStorageTests(object):
with pytest.raises(exceptions.PreconditionFailed):
s.delete(href, '"lolnope"')
def test_delete(self):
s = self._get_storage()
def test_delete(self, s):
href, etag = s.upload(self._create_bogus_item())
s.delete(href, etag)
assert not list(s.list())
def test_delete_nonexisting(self):
s = self._get_storage()
def test_delete_nonexisting(self, s):
with pytest.raises(exceptions.PreconditionFailed):
s.delete('1', '"123"')
def test_list(self):
s = self._get_storage()
def test_list(self, s):
assert not list(s.list())
s.upload(self._create_bogus_item())
assert list(s.list())
def test_has(self):
s = self._get_storage()
def test_has(self, s):
assert not s.has('asd')
href, etag = s.upload(self._create_bogus_item())
assert s.has(href)
assert not s.has('asd')
def test_update_others_stay_the_same(self):
s = self._get_storage()
def test_update_others_stay_the_same(self, s):
info = dict([
s.upload(self._create_bogus_item()),
s.upload(self._create_bogus_item()),
@ -132,14 +130,13 @@ class BaseStorageTests(object):
in s.get_multi(href for href, etag in iteritems(info))
) == info
def test_repr(self):
s = self._get_storage()
def test_repr(self, s):
assert self.storage_class.__name__ in repr(s)
class SupportsCollections(object):
def test_discover(self):
def test_discover(self, storage_args):
collections = set()
def main():
@ -148,8 +145,7 @@ class SupportsCollections(object):
# Create collections on-the-fly for most storages
# Except ownCloud, which already has all of them, and more
i += 1
s = self.storage_class(
**self.get_storage_args(collection=collection))
s = self.storage_class(**storage_args(collection=collection))
# radicale ignores empty collections during discovery
item = self._create_bogus_item()
@ -159,7 +155,7 @@ class SupportsCollections(object):
main() # remove leftover variables from loop for safety
d = self.storage_class.discover(
**self.get_storage_args(collection=None))
**storage_args(collection=None))
def main():
for s in d:
@ -174,15 +170,15 @@ class SupportsCollections(object):
assert not collections
def test_discover_collection_arg(self):
args = self.get_storage_args(collection='test2')
def test_discover_collection_arg(self, storage_args):
args = storage_args(collection='test2')
with pytest.raises(TypeError) as excinfo:
list(self.storage_class.discover(**args))
assert 'collection argument must not be given' in str(excinfo.value)
def test_collection_arg(self):
s = self.storage_class(**self.get_storage_args(collection='test2'))
def test_collection_arg(self, storage):
s = storage(collection='test2')
# Can't do stronger assertion because of radicale, which needs a
# fileextension to guess the collection type.
assert 'test2' in s.collection

49
tests/storage/dav/test_main.py
View file

@ -44,28 +44,23 @@ templates = {
class DavStorageTests(ServerMixin, StorageTests):
def test_dav_broken_item(self):
def test_dav_broken_item(self, s):
item = Item(u'HAHA:YES')
s = self._get_storage()
try:
s.upload(item)
except (exceptions.Error, requests.exceptions.HTTPError):
pass
assert not list(s.list())
@pytest.mark.xfail(dav_server == 'owncloud',
reason='See issue #16')
def test_wrong_etag(self):
super(DavStorageTests, self).test_wrong_etag()
@pytest.mark.xfail(dav_server == 'owncloud', reason='See issue #16')
def test_wrong_etag(self, s):
super(DavStorageTests, self).test_wrong_etag(s)
@pytest.mark.xfail(dav_server == 'owncloud',
reason='See issue #16')
def test_update_nonexisting(self):
super(DavStorageTests, self).test_update_nonexisting()
def test_dav_empty_get_multi_performance(self, monkeypatch):
s = self._get_storage()
@pytest.mark.xfail(dav_server == 'owncloud', reason='See issue #16')
def test_update_nonexisting(self, s):
super(DavStorageTests, self).test_update_nonexisting(s)
def test_dav_empty_get_multi_performance(self, s, monkeypatch):
def breakdown(*a, **kw):
raise AssertionError('Expected not to be called.')
@ -79,10 +74,9 @@ class TestCaldavStorage(DavStorageTests):
item_template = TASK_TEMPLATE
def test_both_vtodo_and_vevent(self):
def test_both_vtodo_and_vevent(self, s):
task = self._create_bogus_item(item_template=TASK_TEMPLATE)
event = self._create_bogus_item(item_template=EVENT_TEMPLATE)
s = self._get_storage()
href_etag_task = s.upload(task)
href_etag_event = s.upload(event)
assert set(s.list()) == set([
@ -91,10 +85,9 @@ class TestCaldavStorage(DavStorageTests):
])
@pytest.mark.parametrize('item_type', ['VTODO', 'VEVENT'])
def test_item_types_correctness(self, item_type):
def test_item_types_correctness(self, item_type, storage_args):
other_item_type = 'VTODO' if item_type == 'VEVENT' else 'VEVENT'
kw = self.get_storage_args()
s = self.storage_class(item_types=(item_type,), **kw)
s = self.storage_class(item_types=(item_type,), **storage_args())
try:
s.upload(self._create_bogus_item(
item_template=templates[other_item_type]))
@ -116,9 +109,9 @@ class TestCaldavStorage(DavStorageTests):
('VTODO', 'VEVENT', 'VJOURNAL'),
()
])
def test_item_types_performance(self, item_types, monkeypatch):
kw = self.get_storage_args()
s = self.storage_class(item_types=item_types, **kw)
def test_item_types_performance(self, storage_args, item_types,
monkeypatch):
s = self.storage_class(item_types=item_types, **storage_args())
item = self._create_bogus_item()
href, etag = s.upload(item)
@ -139,11 +132,11 @@ class TestCaldavStorage(DavStorageTests):
@pytest.mark.xfail(dav_server == 'radicale',
reason='Radicale doesn\'t support timeranges.')
def test_timerange_correctness(self):
kw = self.get_storage_args()
def test_timerange_correctness(self, storage_args):
start_date = datetime.datetime(2013, 9, 10)
end_date = datetime.datetime(2013, 9, 13)
s = self.storage_class(start_date=start_date, end_date=end_date, **kw)
s = self.storage_class(start_date=start_date, end_date=end_date,
**storage_args())
too_old_item = self._create_bogus_item(item_template=dedent(u'''
BEGIN:VCALENDAR
@ -193,15 +186,15 @@ class TestCaldavStorage(DavStorageTests):
assert list(s.list()) == [(href, etag)]
def test_item_types_passed_as_string(self):
kw = self.get_storage_args()
def test_item_types_passed_as_string(self, storage_args):
kw = storage_args()
a = self.storage_class(item_types='VTODO,VEVENT', **kw)
b = self.storage_class(item_types=('VTODO', 'VEVENT'), **kw)
assert a.item_types == b.item_types == ('VTODO', 'VEVENT')
def test_invalid_resource(self, monkeypatch):
def test_invalid_resource(self, monkeypatch, storage_args):
calls = []
args = self.get_storage_args(collection=None)
args = storage_args(collection=None)
def request(session, method, url, data=None, headers=None, auth=None,
verify=None):

3
tests/storage/test_http_with_singlefile.py
View file

@ -78,12 +78,11 @@ class TestHttpStorage(BaseStorageTests):
return {'url': 'http://localhost:123/collection.txt',
'path': self.tmpfile}
def test_update(self):
def test_update(self, s):
'''The original testcase tries to fetch with the old href. But this
storage doesn't have real hrefs, so the href might change if the
underlying UID changes. '''
s = self._get_storage()
item = self._create_bogus_item()
href, etag = s.upload(item)
assert_item_equals(s.get(href)[0], item)

3
tests/storage/test_singlefile.py
View file

@ -42,12 +42,11 @@ class TestSingleFileStorage(BaseStorageTests):
with pytest.raises(IOError):
s = self.storage_class(str(tmpdir) + '/foo.ics', create=False)
def test_update(self):
def test_update(self, s):
'''The original testcase tries to fetch with the old href. But this
storage doesn't have real hrefs, so the href might change if the
underlying UID changes. '''
s = self._get_storage()
item = self._create_bogus_item()
href, etag = s.upload(item)
assert_item_equals(s.get(href)[0], item)

2
tests/utils/test_main.py
View file

@ -157,5 +157,5 @@ def test_get_class_init_args_on_storage():
from vdirsyncer.storage.memory import MemoryStorage
all, required = utils.get_class_init_args(MemoryStorage)
assert all == set(['read_only'])
assert all == set(['collection', 'read_only'])
assert not required

4
vdirsyncer/storage/memory.py
View file

@ -23,7 +23,9 @@ class MemoryStorage(Storage):
Saves data in RAM, only useful for testing.
'''
def __init__(self, **kwargs):
def __init__(self, collection=None, **kwargs):
if collection is not None:
raise ValueError('MemoryStorage does not support collections.')
self.items = {} # href => (etag, item)
super(MemoryStorage, self).__init__(**kwargs)