From 74ec7094786275cfcdb233a1dc368fc87a7e55b5 Mon Sep 17 00:00:00 2001
From: Markus Unterwaditzer <markus@unterwaditzer.net>
Date: Mon, 14 Apr 2014 14:17:42 +0200
Subject: [PATCH] Fix tests

---
 tests/storage/__init__.py | 2 +-
 vdirsyncer/storage/dav.py | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py
index ef10234..9471738 100644
--- a/tests/storage/__init__.py
+++ b/tests/storage/__init__.py
@@ -145,7 +145,7 @@ class StorageTests(object):
         assert not collections
 
     def test_discover_collection_arg(self):
-        args = self.get_storage_args(collection='lol')
+        args = self.get_storage_args(collection='test2')
         with pytest.raises(TypeError) as excinfo:
             list(self.storage_class.discover(**args))
 
diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
index 91fdeab..f9fcea0 100644
--- a/vdirsyncer/storage/dav.py
+++ b/vdirsyncer/storage/dav.py
@@ -136,6 +136,8 @@ class DavStorage(Storage):
     def _check_response(response):
         if response.status_code == 412:
             raise exceptions.PreconditionFailed(response.reason)
+        if response.status_code == 404:
+            raise exceptions.NotFoundError(response.reason)
         response.raise_for_status()
 
     def get(self, href):
@@ -158,7 +160,7 @@ class DavStorage(Storage):
             data=data,
             headers=self._default_headers()
         )
-        response.raise_for_status()
+        self._check_response(response)
         root = etree.XML(response.content)  # etree only can handle bytes
         rv = []
         hrefs_left = set(hrefs)
@@ -190,7 +192,7 @@ class DavStorage(Storage):
     def has(self, href):
         try:
             self.get(href)
-        except exceptions.PreconditionFailed:
+        except exceptions.NotFoundError:
             return False
         else:
             return True
@@ -240,8 +242,6 @@ class DavStorage(Storage):
             href,
             headers=headers
         )
-        if response.status_code == 404:
-            raise exceptions.NotFoundError(href)
         self._check_response(response)
 
     def _list(self, xml):