From 66bd52244de296a9c4da9741251cdb2fb765ed82 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Tue, 8 Mar 2016 21:27:45 +0100 Subject: [PATCH] Remove old Baikal xfails Ref #160 Ref https://github.com/fruux/sabre-dav/issues/422 --- docs/supported.rst | 4 ++-- tests/storage/__init__.py | 12 ------------ 2 files changed, 2 insertions(+), 14 deletions(-) diff --git a/docs/supported.rst b/docs/supported.rst index d1033bd..a1bc1b1 100644 --- a/docs/supported.rst +++ b/docs/supported.rst @@ -199,8 +199,8 @@ Baikal Vdirsyncer is continuously tested against the latest version of Baikal_. -- Baikal up to ``0.2.7`` also uses an old version of SabreDAV, with the same issue as - ownCloud, see :gh:`160`. +- Baikal up to ``0.2.7`` also uses an old version of SabreDAV, with the same + issue as ownCloud, see :gh:`160`. This issue is fixed in later versions. .. _Baikal: http://baikal-server.com/ diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index e0e03a7..0a0071b 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -91,10 +91,6 @@ class StorageTests(object): assert etag2 == etag def test_upload_already_existing(self, s, get_item): - if getattr(self, 'dav_server', '') == 'baikal': - # https://github.com/untitaker/vdirsyncer/issues/160 - pytest.xfail(reason='Baikal uses an old version of SabreDAV.') - item = get_item() s.upload(item) with pytest.raises(exceptions.PreconditionFailed): @@ -117,19 +113,11 @@ class StorageTests(object): assert_item_equals(s.get(href)[0], new_item) def test_update_nonexisting(self, s, get_item): - if getattr(self, 'dav_server', '') == 'baikal': - # https://github.com/untitaker/vdirsyncer/issues/160 - pytest.xfail(reason='Baikal uses an old version of SabreDAV.') - item = get_item() with pytest.raises(exceptions.PreconditionFailed): s.update('huehue', item, '"123"') def test_wrong_etag(self, s, get_item): - if getattr(self, 'dav_server', '') == 'baikal': - # https://github.com/untitaker/vdirsyncer/issues/160 - pytest.xfail(reason='Baikal uses an old version of SabreDAV.') - item = get_item() href, etag = s.upload(item) with pytest.raises(exceptions.PreconditionFailed):