Revamp tests once again

.travis.yml

@@ -6,8 +6,8 @@ python:
     - "3.3"
     - "3.4"
 env:
-    - BUILD=test DAV_SERVER=radicale RADICALE_BACKEND=filesystem REQUIREMENTS=release
+    - BUILD=test
-      # Radicale with filesystem storage (default)
+      # Default build, see Makefile
 
     - BUILD=test DAV_SERVER=radicale RADICALE_BACKEND=filesystem REQUIREMENTS=release
       PKGS='lxml==3.0 requests==2.4.1 requests_toolbelt==0.4.0 click==5.0'

Makefile

@@ -11,11 +11,11 @@
 # If you want to skip the DAV tests against Radicale, use:
 #     make DAV_SERVER=skip # ...
 
-DAV_SERVER = radicale
+export DAV_SERVER := radicale
-REQUIREMENTS = release
+export RADICALE_BACKEND := filesystem
-TESTSERVER_BASE = ./tests/storage/dav/servers/
+export REQUIREMENTS := release
-TRAVIS = false
+export TESTSERVER_BASE := ./tests/storage/dav/servers/
-PIP_INSTALL = pip install
+export TRAVIS := false
 
 install-davserver:
 	set -e; \
@@ -28,8 +28,8 @@ install-davserver:
 	cd $(TESTSERVER_BASE)$(DAV_SERVER) && sh install.sh
 
 install-test: install-davserver
-	$(PIP_INSTALL) pytest pytest-xprocess pytest-localserver
+	pip install pytest pytest-xprocess pytest-localserver
-	[ $(TRAVIS) != "true" ] || $(PIP_INSTALL) coverage coveralls
+	[ $(TRAVIS) != "true" ] || pip install coverage coveralls
 
 test:
 	set -e; \
@@ -60,11 +60,10 @@ sh:  # open subshell with default test config
 linkcheck:
 	sphinx-build -W -b linkcheck ./docs/ ./docs/_build/linkcheck/
 
-install:
+all:
 	$(error Take a look at https://vdirsyncer.readthedocs.org/en/stable/tutorial.html#installation)
 
 release:
 	python setup.py sdist bdist_wheel upload
 
-.DEFAULT_GOAL := install
 .PHONY: docs

tests/storage/dav/servers/radicale/install.sh

@@ -1,7 +1,10 @@
 #!/bin/sh
 set -e
-[ -n "$REQUIREMENTS" ] || export REQUIREMENTS=release
+
-[ -n "$RADICALE_BACKEND" ] || export RADICALE_BACKEND=filesystem
+if [ -z "$RADICALE_BACKEND" ]; then
+    echo "Missing RADICALE_BACKEND"
+    false
+fi
 
 if [ "$REQUIREMENTS" = "release" ]; then
     radicale_pkg="radicale"