Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Minor tox.ini & test runner tidying #699

Merged
merged 4 commits into from
Dec 11, 2012
Merged

Minor tox.ini & test runner tidying #699

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b4a3176
tox: store downloads in tmpdir
acdha Dec 11, 2012
fe84deb
test runner: add $TEST_RUNNER_ARGS env. variable
acdha Dec 11, 2012
5626c61
tox: refactor envlist to include Django versions
acdha Dec 11, 2012
bdc5c6a
test runner: set exit codes on failure
acdha Dec 11, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 15 additions & 9 deletions tests/run_all_tests.sh
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
@@ -1,5 +1,7 @@
#!/bin/bash #!/bin/bash


set -e

if [ "$1" == "--help" ]; then if [ "$1" == "--help" ]; then
echo "Runs the test suite for all backends" echo "Runs the test suite for all backends"
echo echo
Expand All @@ -15,38 +17,42 @@ else
TEST_RUNNER=django-admin.py TEST_RUNNER=django-admin.py
fi fi


export FAIL=0

echo "** CORE **" echo "** CORE **"
$TEST_RUNNER test core --settings=settings $TEST_RUNNER test core --settings=settings $TEST_RUNNER_ARGS || FAIL=1
echo "" echo ""


echo "** DISCOVERY **" echo "** DISCOVERY **"
$TEST_RUNNER test discovery --settings=discovery_settings $TEST_RUNNER test discovery --settings=discovery_settings $TEST_RUNNER_ARGS || FAIL=1
echo "" echo ""


echo "** OVERRIDES **" echo "** OVERRIDES **"
$TEST_RUNNER test overrides --settings=overrides_settings $TEST_RUNNER test overrides --settings=overrides_settings $TEST_RUNNER_ARGS || FAIL=1
echo "" echo ""


echo "** SIMPLE **" 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 ""


echo "** SOLR **" 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 ""


echo "** Elasticsearch **" 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 ""


echo "** WHOOSH **" 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 ""


echo "** MULTIPLE INDEX **" echo "** MULTIPLE INDEX **"
$TEST_RUNNER test multipleindex --settings=multipleindex_settings $TEST_RUNNER test multipleindex --settings=multipleindex_settings $TEST_RUNNER_ARGS || FAIL=1
echo "" echo ""


echo "** SPATIAL **" echo "** SPATIAL **"
$TEST_RUNNER test spatial --settings=spatial_settings $TEST_RUNNER test spatial --settings=spatial_settings $TEST_RUNNER_ARGS || FAIL=1
echo "" echo ""

exit $FAIL
43 changes: 39 additions & 4 deletions tox.ini
View file
Open in desktop
Original file line number Original file line Diff line number Diff line change
@@ -1,14 +1,49 @@
[tox] [tox]
envlist = py25,py26,py27,docs 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 = .tox/_download/ downloadcache = {envtmpdir}tox-downloadcache/

[base]
deps =
mock
pysolr
poster
whoosh
pyelasticsearch
httplib2
python-dateutil
geopy


[testenv] [testenv]
setenv = setenv =
PYTHONPATH = {toxinidir}/tests PYTHONPATH = {toxinidir}/tests
TEST_RUNNER_ARGS = -v0
commands = commands =
{toxinidir}/tests/run_all_tests.sh {toxinidir}/tests/run_all_tests.sh
deps = deps = {[base]deps}
django==1.3
[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] [testenv:docs]
changedir = docs changedir = docs
Expand Down