From a55d1f2d039400b9bda342091b483941aaa9b65d Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Sun, 4 Jan 2015 13:43:53 +0100
Subject: [PATCH] Re-enable baikal tests

---
 .travis.yml                    |  2 +-
 tests/storage/__init__.py      | 12 ++++++++++++
 tests/storage/dav/test_main.py |  2 ++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/.travis.yml b/.travis.yml
index a884787..3cd73b5 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,7 +10,7 @@ env:
     - BUILD=tests DAV_SERVER=radicale RADICALE_BACKEND=multifilesystem REQUIREMENTS=devel
     - BUILD=tests DAV_SERVER=radicale RADICALE_BACKEND=database REQUIREMENTS=devel
     - BUILD=tests DAV_SERVER=owncloud REQUIREMENTS=release
-    #- BUILD=tests DAV_SERVER=baikal REQUIREMENTS=release
+    - BUILD=tests DAV_SERVER=baikal REQUIREMENTS=release
     - BUILD=style
 
 install:
diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py
index f66f59d..a0f255d 100644
--- a/tests/storage/__init__.py
+++ b/tests/storage/__init__.py
@@ -75,6 +75,10 @@ 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):
@@ -97,11 +101,19 @@ 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):
diff --git a/tests/storage/dav/test_main.py b/tests/storage/dav/test_main.py
index 128347a..78fa8bd 100644
--- a/tests/storage/dav/test_main.py
+++ b/tests/storage/dav/test_main.py
@@ -37,6 +37,8 @@ ServerMixin = _get_server_mixin(dav_server)
 
 
 class DavStorageTests(ServerMixin, StorageTests):
+    dav_server = dav_server
+
     def test_dav_broken_item(self, s):
         item = Item(u'HAHA:YES')
         try: