Move owncloud repo location

.travis.yml

@@ -4,10 +4,10 @@ env:
     global:
         - IS_TRAVIS=true
     matrix:
-        - DAV_SERVER=radicale_filesystem REQUIREMENTS=release
-        - DAV_SERVER=radicale_filesystem REQUIREMENTS=devel
-        - DAV_SERVER=radicale_database REQUIREMENTS=release
-        - DAV_SERVER=radicale_database REQUIREMENTS=devel
+        - DAV_SERVER=radicale RADICALE_BACKEND=filesystem REQUIREMENTS=release
+        - DAV_SERVER=radicale RADICALE_BACKEND=filesystem REQUIREMENTS=devel
+        - DAV_SERVER=radicale RADICALE_BACKEND=database REQUIREMENTS=release
+        - DAV_SERVER=radicale RADICALE_BACKEND=database REQUIREMENTS=devel
         - DAV_SERVER=owncloud REQUIREMENTS=release
 
 install:

install-deps.sh

@@ -3,6 +3,7 @@ echo "The shell is $SHELL"
 set -e
 [ -n "$DAV_SERVER" ] || DAV_SERVER=radicale_filesystem
 [ -n "$REQUIREMENTS" ] || REQUIREMENTS=release
+TESTSERVER_BASE=./tests/storage/dav/servers/
 
 PIP_INSTALL="pip install"
 if [ "$IS_TRAVIS" = "true" ]; then
@@ -14,38 +15,28 @@ fi
 $PIP_INSTALL --editable .
 $PIP_INSTALL -r requirements.txt
 
-davserver_radicale_filesystem() {
-    radicale_deps
-}
-
-davserver_radicale_database() {
-    radicale_deps
-    $PIP_INSTALL sqlalchemy pysqlite
-}
 
-radicale_deps() {
-    if [ "$REQUIREMENTS" = "release" ]; then
-        radicale_pkg="radicale"
-    elif [ "$REQUIREMENTS" = "devel" ]; then
-        radicale_pkg="git+https://github.com/Kozea/Radicale.git"
-    else
-        echo "Invalid requirements envvar"
-        false
-    fi
-    $PIP_INSTALL werkzeug $radicale_pkg
-}
-
-davserver_owncloud() {
+testserver_from_repo() {
     # Maybe tmpfs is mounted on /tmp/, can't harm anyway.
-    if [ ! -d ./owncloud-testserver/ ]; then
+    if [ ! -d $TESTSERVER_BASE$1/ ]; then
         git clone --depth=1 \
-            https://github.com/untitaker/owncloud-testserver.git \
-            /tmp/owncloud-testserver
-        ln -s /tmp/owncloud-testserver .
+            https://github.com/untitaker/$1-testserver.git \
+            /tmp/$1-testserver
+        mkdir testservers
+        ln -s /tmp/$1-testserver $TESTSERVER_BASE$1
     fi
-    cd ./owncloud-testserver/
+    cd $TESTSERVER_BASE$1
     sh install.sh
 }
 
+davserver_owncloud() {
+    testserver_from_repo owncloud
+}
+
+davserver_radicale() {
+    testserver_from_repo radicale
+}
+
+
 
 davserver_$DAV_SERVER

setup.cfg

@@ -1,2 +1,5 @@
 [wheel]
 universal = 1
+
+[pytest]
+norecursedirs = tests/storage/dav/servers/*

tests/storage/dav/servers/__init__.py

@@ -0,0 +1,8 @@
+# -*- coding: utf-8 -*-
+'''
+    tests.storage.dav.servers
+    ~~~~~~~~~~~~~~~~~~~~~~~~~
+
+    :copyright: (c) 2014 Markus Unterwaditzer
+    :license: MIT, see LICENSE for more details.
+'''

tests/storage/dav/servers/owncloud

@@ -0,0 +1 @@
+/home/untitaker/projects/owncloud-testserver/

tests/storage/dav/test_main.py

@@ -19,11 +19,11 @@
 import requests.exceptions
 
 
-dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale_filesystem'
-if dav_server.startswith('radicale_'):
-    from ._radicale import ServerMixin
+dav_server = os.environ.get('DAV_SERVER', '').strip() or 'radicale'
+if dav_server == 'radicale':
+    from tests.storage.dav.servers.radicale import ServerMixin
 elif dav_server == 'owncloud':
-    from ._owncloud import ServerMixin
+    from tests.storage.dav.servers.owncloud import ServerMixin
 else:
     raise RuntimeError('{} is not a known DAV server.'.format(dav_server))
 
@@ -154,7 +154,7 @@ def _list(*a, **kw):
         list(s.list())
         assert len(calls) == len(item_types)
 
-    @pytest.mark.xfail(dav_server.startswith('radicale_'),
+    @pytest.mark.xfail(dav_server == 'radicale',
                        reason='Radicale doesn\'t support timeranges.')
     def test_timerange_correctness(self):
         kw = self.get_storage_args()