From 64a8a682e904a7ff19088dab3791e8c88d5d3001 Mon Sep 17 00:00:00 2001 From: Markus Unterwaditzer Date: Sat, 29 Mar 2014 12:24:01 +0100 Subject: [PATCH] Fix tests and remove silly logging --- tests/storage/__init__.py | 3 +++ vdirsyncer/storage/dav.py | 13 ++----------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/tests/storage/__init__.py b/tests/storage/__init__.py index d140c57..d08f2e3 100644 --- a/tests/storage/__init__.py +++ b/tests/storage/__init__.py @@ -118,10 +118,13 @@ class StorageTests(object): # doesn't really work there. Skip those collections, as they # are not relevant to us. continue + collection = collections.remove(s.collection) ((href, etag),) = s.list() item, etag = s.get(href) assert item.raw in items + assert not collections + def test_collection_arg(self): s = self.storage_class(**self.get_storage_args(collection='test2')) # Can't do stronger assertion because of radicale, which needs a diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py index ceb5252..2b031f8 100644 --- a/vdirsyncer/storage/dav.py +++ b/vdirsyncer/storage/dav.py @@ -94,17 +94,8 @@ class DavStorage(HttpStorageBase): if self._session is None: self._session = requests.session() url = self.parsed_url.scheme + '://' + self.parsed_url.netloc + path - dav_logger.debug(u'Method: {}'.format(method)) - dav_logger.debug(u'Path: {}'.format(path)) - dav_logger.debug(u'Headers: {}'.format(headers)) - dav_logger.debug(u'/// DATA') - dav_logger.debug(data) - dav_logger.debug(u'/// END DATA') - r = self._session.request(method, url, data=data, headers=headers, - **self._settings) - dav_logger.debug(r.status_code) - dav_logger.debug(r.text) - return r + return self._session.request(method, url, data=data, headers=headers, + **self._settings) @staticmethod def _check_response(response):