run_tests.sh now runs tox

Solution4Future · Jan 28, 2015 · 621e1b8 · 621e1b8
1 parent 119f49b
commit 621e1b8
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 23 deletions.
diff --git a/run_tests.sh b/run_tests.sh
@@ -75,6 +75,13 @@ if [ -z "$FN" ]; then
     fi;
 fi;
 
+# tox compat
+declare -A TOX_ENVS;
+TOX_ENVS["cpy26"]="py26";
+TOX_ENVS["cpy27"]="py27";
+TOX_ENVS["cpy33"]="py33";
+TOX_ENVS["cpy34"]="py34";
+
 # Initialization
 IRONPYTHON_URL_BASE=https://github.com/IronLanguages/main/archive;
 CPYTHON_URL_BASE=http://www.python.org/ftp/python;
@@ -166,14 +173,14 @@ elif [ $PYIMPL == 'ipy' ]; then
 fi;
 
 # Set up distribute
-if [ ! -x "$EASY" ]; then
-  (
-    mkdir -p .data; cd .data;
-    $PYTHON "$WORKSPACE"/bin/distribute_setup.py;
-  )
-fi;
+#if [ ! -x "$EASY" ]; then
+#  (
+#    mkdir -p .data; cd .data;
+#    $PYTHON "$WORKSPACE"/bin/distribute_setup.py;
+#  )
+#fi;
 
-while read line; do $EASY $line; done < requirements/test_requirements.txt
+#while read line; do $EASY $line; done < requirements/test_requirements.txt
 
 if [ $PYIMPL == 'cpy' ]; then
     # Set up coverage
@@ -187,7 +194,8 @@ if [ $PYIMPL == 'cpy' ]; then
     fi;
 
     # Run tests
-    bash -c "$COVERAGE run --source=spyne setup.py test; exit 0"
+    TENV=${TOX_ENVS[$PYFLAV]};
+    bash -c "BASEPYTHON=$PYTHON tox -e $TENV"
 
     # Generate coverage report
     $COVERAGE xml -i --omit=spyne/test/*;

diff --git a/tox.ini b/tox.ini
@@ -12,33 +12,36 @@ envlist = pypy, py26, py27, py33, py34, py33-travis, py34-travis,
 usedevelop = True
 
 [testenv]
-commands = python setup.py test
+commands = coverage run --source=spyne setup.py test
 deps =
     --download-cache={homedir}/.pipcache
     -rrequirements/test_requirements.txt
 setenv =
     PYTHONHASHSEED = 3332349646
 
 [testenv:py26]
-commands = python setup.py test
+basepython = {env:BASEPYTHON:python2.6}
+commands = coverage run --source=spyne setup.py test
 deps =
     --download-cache={homedir}/.pipcache
     -rrequirements/test_requirements_py26.txt
 
 [testenv:py33]
-commands = python setup.py test
+basepython = {env:BASEPYTHON:python3.3}
+commands = coverage run --source=spyne setup.py test
 
 [testenv:py34]
-commands = python setup.py test
+basepython = {env:BASEPYTHON:python3.4}
+commands = coverage run --source=spyne setup.py test
 
 [testenv:py33-travis]
-commands = python setup.py test_python3
+commands = coverage run --source=spyne setup.py test_python3
 
 [testenv:py34-travis]
-commands = python setup.py test_python3
+commands = coverage run --source=spyne setup.py test_python3
 
 [testenv:py26-dj1.4.x]
-basepython = python2.6
+basepython = {env:BASEPYTHON:python2.6}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/
@@ -50,7 +53,7 @@ deps =
     -rrequirements/test_django_req.txt
 
 [testenv:py26-dj1.5.x]
-basepython = python2.6
+basepython = {env:BASEPYTHON:python2.6}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/
@@ -62,7 +65,7 @@ deps =
     -rrequirements/test_django_req.txt
 
 [testenv:py26-dj1.6.x]
-basepython = python2.6
+basepython = {env:BASEPYTHON:python2.6}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/
@@ -74,7 +77,7 @@ deps =
     -rrequirements/test_django_req.txt
 
 [testenv:py27-dj1.4.x]
-basepython = python2.7
+basepython = {env:BASEPYTHON:python2.7}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/
@@ -86,7 +89,7 @@ deps =
     -rrequirements/test_django_req.txt
 
 [testenv:py27-dj1.5.x]
-basepython = python2.7
+basepython = {env:BASEPYTHON:python2.7}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/
@@ -98,7 +101,7 @@ deps =
     -rrequirements/test_django_req.txt
 
 [testenv:py27-dj1.6.x]
-basepython = python2.7
+basepython = {env:BASEPYTHON:python2.7}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/
@@ -110,7 +113,7 @@ deps =
     -rrequirements/test_django_req.txt
 
 [testenv:py27-dj1.7.x]
-basepython = python2.7
+basepython = {env:BASEPYTHON:python2.7}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/
@@ -122,7 +125,7 @@ deps =
     -rrequirements/test_django_req.txt
 
 [testenv:py33-dj1.7.x]
-basepython = python3.4
+basepython = {env:BASEPYTHON:python3.3}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/
@@ -134,7 +137,7 @@ deps =
     -rrequirements/test_django_req.txt
 
 [testenv:py34-dj1.7.x]
-basepython = python3.4
+basepython = {env:BASEPYTHON:python3.4}
 setenv =
     DJANGO_SETTINGS_MODULE=rpctest.settings
     PYTHONPATH = {toxinidir}/examples/django/