Merge pull request django-haystack#699 from acdha/tox-multiple-django-versions

Minor tox.ini & test runner tidying

Author: acdha

tests/run_all_tests.sh

@@ -1,5 +1,7 @@
 #!/bin/bash
 
+set -e
+
 if [ "$1" == "--help" ]; then
     echo "Runs the test suite for all backends"
     echo
@@ -15,38 +17,42 @@ else
     TEST_RUNNER=django-admin.py
 fi
 
+export FAIL=0
+
 echo "** CORE **"
-$TEST_RUNNER test core --settings=settings
+$TEST_RUNNER test core --settings=settings $TEST_RUNNER_ARGS || FAIL=1
 echo ""
 
 echo "** DISCOVERY **"
-$TEST_RUNNER test discovery --settings=discovery_settings
+$TEST_RUNNER test discovery --settings=discovery_settings $TEST_RUNNER_ARGS || FAIL=1
 echo ""
 
 echo "** OVERRIDES **"
-$TEST_RUNNER test overrides --settings=overrides_settings
+$TEST_RUNNER test overrides --settings=overrides_settings $TEST_RUNNER_ARGS || FAIL=1
 echo ""
 
 echo "** SIMPLE **"
-$TEST_RUNNER test simple_tests --settings=simple_settings
+$TEST_RUNNER test simple_tests --settings=simple_settings $TEST_RUNNER_ARGS || FAIL=1
 echo ""
 
 echo "** SOLR **"
-$TEST_RUNNER test solr_tests --settings=solr_settings
+$TEST_RUNNER test solr_tests --settings=solr_settings $TEST_RUNNER_ARGS || FAIL=1
 echo ""
 
 echo "** Elasticsearch **"
-$TEST_RUNNER test elasticsearch_tests --settings=elasticsearch_settings
+$TEST_RUNNER test elasticsearch_tests --settings=elasticsearch_settings $TEST_RUNNER_ARGS || FAIL=1
 echo ""
 
 echo "** WHOOSH **"
-$TEST_RUNNER test whoosh_tests --settings=whoosh_settings
+$TEST_RUNNER test whoosh_tests --settings=whoosh_settings $TEST_RUNNER_ARGS || FAIL=1
 echo ""
 
 echo "** MULTIPLE INDEX **"
-$TEST_RUNNER test multipleindex --settings=multipleindex_settings
+$TEST_RUNNER test multipleindex --settings=multipleindex_settings $TEST_RUNNER_ARGS || FAIL=1
 echo ""
 
 echo "** SPATIAL **"
-$TEST_RUNNER test spatial --settings=spatial_settings
+$TEST_RUNNER test spatial --settings=spatial_settings $TEST_RUNNER_ARGS || FAIL=1
 echo ""
+
+exit $FAIL

tox.ini

@@ -1,14 +1,49 @@
 [tox]
-envlist = py25,py26,py27,docs
-downloadcache = .tox/_download/
+envlist = docs, py27-django-1.4, py27-django-1.3, py26-django-1.4, py26-django-1.3, py25-django-1.4, py25-django-1.3
+downloadcache = {envtmpdir}tox-downloadcache/
+
+[base]
+deps =
+    mock
+    pysolr
+    poster
+    whoosh
+    pyelasticsearch
+    httplib2
+    python-dateutil
+    geopy
 
 [testenv]
 setenv =
     PYTHONPATH = {toxinidir}/tests
+    TEST_RUNNER_ARGS = -v0
 commands =
     {toxinidir}/tests/run_all_tests.sh
-deps =
-    django==1.3
+deps = {[base]deps}
+
+[testenv:py27-django-1.4]
+deps = django>=1.4,<1.5
+    {[base]deps}
+
+[testenv:py27-django-1.3]
+deps = django>=1.3,<1.4
+    {[base]deps}
+
+[testenv:py26-django-1.4]
+deps = django>=1.4,<1.5
+    {[base]deps}
+
+[testenv:py26-django-1.3]
+deps = django>=1.3,<1.4
+    {[base]deps}
+
+[testenv:py25-django-1.4]
+deps = django>=1.4,<1.5
+    {[base]deps}
+
+[testenv:py25-django-1.3]
+deps = django>=1.3,<1.4
+    {[base]deps}
 
 [testenv:docs]
 changedir = docs