From c234bce6565610cc57fd44a520f810ad1768c824 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sun, 30 Nov 2014 23:19:06 +0100 Subject: [PATCH] "A from B" => "B/A" --- tests/storage/__init__.py | 8 +++++--- vdirsyncer/storage/base.py | 2 +- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index 2a5cc3c..2b4c960 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -34,8 +34,9 @@ class BaseStorageTests(object): @pytest.fixture def get_storage(self, storage_args): - def inner(**kw): - return self.storage_class(**storage_args(**kw)) + def inner(collection=None, **kw): + kw.update(storage_args(collection=collection)) + return self.storage_class(**kw) return inner @@ -136,8 +137,9 @@ class BaseStorageTests(object): in s.get_multi(href for href, etag in iteritems(info)) ) == info - def test_repr(self, s): + def test_repr(self, s, get_storage): assert self.storage_class.__name__ in repr(s) + assert s.instance_name is None class SupportsCollections(object): diff --git a/vdirsyncer/storage/base.py b/vdirsyncer/storage/base.py index 01c707b..723584a 100644 --- a/vdirsyncer/storage/base.py +++ b/vdirsyncer/storage/base.py @@ -62,7 +62,7 @@ class Storage(object): raise ValueError('This storage is read-only.') self.read_only = bool(read_only) if collection and instance_name: - instance_name = '{} from {}'.format(collection, instance_name) + instance_name = '{}/{}'.format(instance_name, collection) self.instance_name = instance_name self.collection = collection