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

Auto merge of #450 - pimutils:fix-discover-test, r=untitaker

Browse source 
Fix defective discovery test

Found via #448
This commit is contained in:
Homu 2016-05-14 04:44:15 +09:00
commit 36ffac8801
1 changed files with 23 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

47
tests/storage/__init__.py
View file

@ -169,36 +169,35 @@ class StorageTests(object):
assert self.storage_class.__name__ in repr(s) assert self.storage_class.__name__ in repr(s)
assert s.instance_name is None assert s.instance_name is None
def test_discover(self, requires_collections, get_storage_args, get_item): def test_discover(self, requires_collections, get_storage_args):
expected = set() collections = set()
items = {}
for i in range(1, 5): for i in range(1, 5):
# Create collections, but use the "collection" attribute because
# Radicale requires file extensions in their names.
collection = 'test{}'.format(i) collection = 'test{}'.format(i)
s = self.storage_class( s = self.storage_class(**get_storage_args(collection=collection))
**self.storage_class.create_collection( assert not list(s.list())
**get_storage_args(collection=collection) collections.add(s.collection)
)
)
items[s.collection] = [s.upload(get_item())] actual = set(
expected.add(s.collection) c['collection'] for c in
self.storage_class.discover(**get_storage_args(collection=None))
)
d = self.storage_class.discover( assert actual >= collections
**get_storage_args(collection=None))
actual = set(args['collection'] for args in d) def test_create_collection(self, requires_collections, get_storage_args,
assert actual >= expected get_item):
if getattr(self, 'dav_server', '') == 'radicale':
pytest.xfail('MKCOL is broken under Radicale 1.x')
for storage_args in d: args = get_storage_args(collection=None)
collection = storage_args['collection'] args['collection'] = 'test'
if collection not in expected:
continue s = self.storage_class(
s = self.storage_class(**storage_args) **self.storage_class.create_collection(**args)
rv = list(s.list()) )
assert rv == items[collection]
items = [s.upload(get_item())]
assert list(s.list()) == items
def test_discover_collection_arg(self, requires_collections, def test_discover_collection_arg(self, requires_collections,
get_storage_args): get_storage_args):