diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index 8c3a6e6..54baae3 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -227,7 +227,7 @@ class StorageTests(object): def test_specialchars(self, monkeypatch, requires_collections, get_storage_args, get_item): if getattr(self, 'dav_server', '') == 'radicale': - pytest.skip('Radicale is fundamentally broken.') + pytest.xfail('Radicale is fundamentally broken.') monkeypatch.setattr('vdirsyncer.utils.generate_href', lambda x: x) diff --git a/tests/storage/dav/__init__.py b/tests/storage/dav/__init__.py index dd80b81..c5dded8 100644 --- a/tests/storage/dav/__init__.py +++ b/tests/storage/dav/__init__.py @@ -2,6 +2,8 @@ import os +import pytest + import requests import requests.exceptions @@ -41,10 +43,11 @@ class DavStorageTests(ServerMixin, StorageTests): monkeypatch.undo() def test_dav_unicode_href(self, s, get_item, monkeypatch): - if self.dav_server != 'radicale': - # Radicale is unable to deal with unicode hrefs - monkeypatch.setattr(s, '_get_href', - lambda item: item.ident + s.fileext) + if self.dav_server == 'radicale': + pytest.xfail('Radicale is unable to deal with unicode hrefs') + + monkeypatch.setattr(s, '_get_href', + lambda item: item.ident + s.fileext) item = get_item(uid=u'lolätvdirsynceröü град сатану') href, etag = s.upload(item) item2, etag2 = s.get(href)