Fix more tests

.travis.yml

@@ -19,6 +19,5 @@ script:
 
 matrix:
     allow_failures:
-        # radicale db storage is broken in 0.8
+        # radicale db storage is broken in 0.8, all tests fail
         - env: DAV_SERVER=radicale RADICALE_BACKEND=database REQUIREMENTS=release
-        - env: DAV_SERVER=owncloud REQUIREMENTS=release

tests/storage/__init__.py

@@ -162,3 +162,4 @@ class StorageTests(object):
         assert not s.has('asd')
         href, etag = s.upload(self._create_bogus_item(1))
         assert s.has(href)
+        assert not s.has('asd')

tests/storage/dav/test_main.py

@@ -91,6 +91,17 @@ class DavStorageTests(ServerMixin, StorageTests):
             pass
         assert not list(s.list())
 
+    @pytest.mark.xfail(dav_server == 'owncloud',
+                       reason='See issue #16')
+    def test_wrong_etag(self):
+        super(DavStorageTests, self).test_wrong_etag()
+
+    @pytest.mark.xfail(dav_server == 'owncloud',
+                       reason='See issue #16')
+    def test_update_nonexisting(self):
+        super(DavStorageTests, self).test_update_nonexisting()
+
+
 
 class TestCaldavStorage(DavStorageTests):
     storage_class = CaldavStorage

vdirsyncer/storage/base.py

@@ -7,6 +7,7 @@
     :license: MIT, see LICENSE for more details.
 '''
 
+from .. import exceptions
 
 class Item(object):
 
@@ -80,6 +81,8 @@ class Storage(object):
         '''
         :param href: href to fetch
         :returns: (item, etag)
+        :raises: :exc:`vdirsyncer.exceptions.PreconditionFailed` if item can't
+            be found.
         '''
         raise NotImplementedError()
 
@@ -87,7 +90,7 @@ class Storage(object):
         '''
         :param hrefs: list of hrefs to fetch
         :raises: :exc:`vdirsyncer.exceptions.PreconditionFailed` if one of the
-        items couldn't be found.
+            items couldn't be found.
         :returns: iterable of (href, item, etag)
         '''
         for href in hrefs:
@@ -99,7 +102,12 @@ class Storage(object):
         check if item exists by href
         :returns: True or False
         '''
-        raise NotImplementedError()
+        try:
+            self.get(href)
+        except exceptions.PreconditionFailed:
+            return False
+        else:
+            return True
 
     def upload(self, item):
         '''

vdirsyncer/storage/dav.py

@@ -189,14 +189,6 @@ class DavStorage(Storage):
             raise exceptions.NotFoundError(href)
         return rv
 
-    def has(self, href):
-        try:
-            self.get(href)
-        except exceptions.NotFoundError:
-            return False
-        else:
-            return True
-
     def _put(self, href, item, etag):
         headers = self._default_headers()
         headers['Content-Type'] = self.item_mimetype

vdirsyncer/storage/filesystem.py

@@ -109,12 +109,16 @@ class FilesystemStorage(Storage):
 
     def get(self, href):
         fpath = self._get_filepath(href)
-        with open(fpath, 'rb') as f:
+        try:
-            return (Item(f.read().decode(self.encoding)),
+            with open(fpath, 'rb') as f:
-                    _get_etag(fpath))
+                return (Item(f.read().decode(self.encoding)),
-
+                        _get_etag(fpath))
-    def has(self, href):
+        except IOError as e:
-        return os.path.isfile(self._get_filepath(href))
+            import errno
+            if e.errno == errno.ENOENT:
+                raise exceptions.NotFoundError(href)
+            else:
+                raise
 
     def upload(self, item):
         href = self._get_href(item.uid)

vdirsyncer/storage/http.py

@@ -115,6 +115,3 @@ class HttpStorage(Storage):
     def get(self, href):
         x = self._items[href]
         return x, hashlib.sha256(x.raw).hexdigest()
-
-    def has(self, href):
-        return href in self._items