Merge branch 'master' into remotestorage

untitaker · untitaker · commit 8100f0b8b857 · 2015-09-19T22:42:28.000+02:00
diff --git a/tests/storage/dav/__init__.py b/tests/storage/dav/__init__.py
@@ -13,7 +13,7 @@
 from .. import StorageTests
 
 
-dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale'
+dav_server = os.environ.get('DAV_SERVER', '').strip() or 'skip'
 
 
 def _get_server_mixin(server_name):
