reorg test runner to remove redundant test runs

dhellmann · dhellmann · commit 4e3d522017ff · 2013-04-08T09:12:30.000-04:00
diff --git a/tests/run_tests b/tests/run_tests
@@ -2,12 +2,6 @@
 
 #set -x
 
-if [ -z "$TOXIC" ]
-then
-    echo "Only run this via tox" 1>&2
-    exit 1
-fi
-
 envdir="$1"
 shift
 scripts="$*"
@@ -21,25 +15,6 @@ then
     fi
 fi
 
-# Make sure the test shells exist before proceeding, otherwise tests are
-# going to fail later.
-DESIRED_SHELLS=${DESIRED_SHELLS:-"bash zsh ksh"}
-missing_shells=""
-test_shells=""
-for shell in $DESIRED_SHELLS
-do
-    if test_shell=$(which $shell); then
-        test_shells="$test_shells $test_shell"
-    else
-        missing_shells="$missing_shells $shell"
-    fi
-done
-if [ -n "$missing_shells" ]
-then
-    echo "Couldn't find the following shells: $missing_shells" 1>&2
-    exit 1
-fi
-
 # Force the tox virtualenv to be active.
 #
 # Since this script runs from within a separate shell created by tox,
@@ -48,14 +23,19 @@ fi
 # are *not* inherited.
 #
 source "$envdir/bin/activate"
+TMPDIR="$envdir/tmp"
+export TMPDIR
+mkdir -p "$TMPDIR"
 
 # Set up virtualenvwrapper.hook_loader to print more details than usual for debugging.
 #export HOOK_VERBOSE_OPTION=-vvv
-export HOOK_VERBOSE_OPTION="-q"
+HOOK_VERBOSE_OPTION="-q"
+export HOOK_VERBOSE_OPTION
 
 # Force virtualenvwrapper to use the python interpreter in the
 # tox-created virtualenv.
-export VIRTUALENVWRAPPER_PYTHON="$envdir/bin/python"
+VIRTUALENVWRAPPER_PYTHON="$envdir/bin/python"
+export VIRTUALENVWRAPPER_PYTHON
 
 # Clear any user settings for the hook directory or log directory
 unset VIRTUALENVWRAPPER_HOOK_DIR
@@ -68,31 +48,24 @@ unset VIRTUALENVWRAPPER_VIRTUALENV_ARGS
 for test_script in $scripts
 do
 
-    for test_shell in $test_shells
-    do
-        unset BASH
-        unset ZSH_VERSION
-        test_shell_opts=
-        case /$test_shell in
-            */zsh) test_shell_opts="-o shwordsplit" ;;
-        esac
-        export test_shell
-        export SHELL=$(which $test_shell)
+    echo
+    echo '********************************************************************************'
+    echo "Running $test_script"
+    echo "  VIRTUAL_ENV=$VIRTUAL_ENV"
+    echo "  VIRTUALENVWRAPPER_PYTHON=$VIRTUALENVWRAPPER_PYTHON"
+    echo "    $($VIRTUALENVWRAPPER_PYTHON -V 2>&1)"
+    echo "  PYTHONPATH=$PYTHONPATH"
+    echo "  SHELL=$SHELL"
+    echo "  BASH_VERSION=$BASH_VERSION"
+    echo "  ZSH_VERSION=$ZSH_VERSION"
+    echo "  KSH_VERSION=$KSH_VERSION"
+    echo "  virtualenv=$(which virtualenv)"
+    echo
+    SHUNIT_PARENT="$test_script"
+    export SHUNIT_PARENT
+    $test_shell_opts $test_script || exit 1
+    echo
 
-        echo
-        echo '********************************************************************************'
-        echo "Running $test_script"
-        echo "  VIRTUAL_ENV=$VIRTUAL_ENV"
-        echo "  VIRTUALENVWRAPPER_PYTHON=$VIRTUALENVWRAPPER_PYTHON"
-        echo "    $($VIRTUALENVWRAPPER_PYTHON -V 2>&1)"
-        echo "  PYTHONPATH=$PYTHONPATH"
-        echo "  SHELL=$test_shell"
-        echo "  virtualenv=$(which virtualenv)"
-        echo
-        export SHUNIT_PARENT="$test_script"
-        $test_shell $test_shell_opts $test_script || exit 1
-        echo
-    done
 done
 
 exit 0
diff --git a/tests/setup.sh b/tests/setup.sh
diff --git a/tests/test.sh b/tests/test.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_add2virtualenv.sh b/tests/test_add2virtualenv.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_cd.sh b/tests/test_cd.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_cp.sh b/tests/test_cp.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_cpvirtualenv.sh b/tests/test_cpvirtualenv.sh
@@ -1,4 +1,4 @@
-#venv!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_deactivate.sh b/tests/test_deactivate.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_derive_workon_home.sh b/tests/test_derive_workon_home.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_dir_stack.sh b/tests/test_dir_stack.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_expandpath.sh b/tests/test_expandpath.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_hook_dir.sh b/tests/test_hook_dir.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_lazy.sh b/tests/test_lazy.sh
@@ -1,3 +1,4 @@
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_lazy_loaded.sh b/tests/test_lazy_loaded.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_lazy_run.sh b/tests/test_lazy_run.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_log_file.sh b/tests/test_log_file.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_ls.sh b/tests/test_ls.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_mktmpenv.sh b/tests/test_mktmpenv.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_mkvirtualenv.sh b/tests/test_mkvirtualenv.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_mkvirtualenv_associate.sh b/tests/test_mkvirtualenv_associate.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_mkvirtualenv_install.sh b/tests/test_mkvirtualenv_install.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_mkvirtualenv_requirements.sh b/tests/test_mkvirtualenv_requirements.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_project.sh b/tests/test_project.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(dirname $0)
 source "$test_dir/setup.sh"
diff --git a/tests/test_project_activate.sh b/tests/test_project_activate.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(dirname $0)
 source "$test_dir/setup.sh"
diff --git a/tests/test_project_cd.sh b/tests/test_project_cd.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(dirname $0)
 source "$test_dir/setup.sh"
diff --git a/tests/test_project_mk.sh b/tests/test_project_mk.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(dirname $0)
 source "$test_dir/setup.sh"
diff --git a/tests/test_project_templates.sh b/tests/test_project_templates.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(dirname $0)
 source "$test_dir/setup.sh"
diff --git a/tests/test_rmvirtualenv.sh b/tests/test_rmvirtualenv.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_run_hook.sh b/tests/test_run_hook.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_support.sh b/tests/test_support.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_tempfile.sh b/tests/test_tempfile.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_toggleglobalsitepackages.sh b/tests/test_toggleglobalsitepackages.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tests/test_workon.sh b/tests/test_workon.sh
@@ -1,4 +1,4 @@
-#!/bin/sh
+# -*- mode: shell-script -*-
 
 test_dir=$(cd $(dirname $0) && pwd)
 source "$test_dir/setup.sh"
diff --git a/tox.ini b/tox.ini
@@ -1,5 +1,5 @@
 [tox]
-envlist = py27,py26,py32,style
+envlist = py27,py26,py32,py33,zsh,ksh,style
 
 [testenv]
 commands = bash ./tests/run_tests {envdir} []
@@ -13,10 +13,41 @@ setenv =
 deps = flake8
 commands = flake8 virtualenvwrapper docs/source/conf.py
 
+[testenv:py27]
+setenv = 
+  SHELL = /bin/bash
+commands =  bash ./tests/run_tests {envdir} []
 
-# Not sure why this is needed, but on my system if it isn't included then
-# the python version picked up for 2.6 is actually 2.7.
+# Not sure why the basepython setting is needed, but on my system if
+# it isn't included then the python version picked up for 2.6 is
+# actually 2.7.
+#
 # IF THIS CAUSES YOU A PROBLEM COMMENT IT OUT BEFORE RUNNING THE TESTS.
+#
 [testenv:py26]
-#basepython=/Library/Frameworks/Python.framework/Versions/2.6/bin/python2.6
 basepython=python2.6
+setenv = 
+  SHELL = /bin/bash
+commands =  bash ./tests/run_tests {envdir} []
+
+[testenv:py32]
+setenv = 
+  SHELL = /bin/bash
+commands =  bash ./tests/run_tests {envdir} []
+
+[testenv:py33]
+setenv = 
+  SHELL = /bin/bash
+commands =  bash ./tests/run_tests {envdir} []
+
+[testenv:zsh]
+basepython=python2.7
+setenv = 
+  SHELL = /bin/zsh
+commands =  zsh -o shwordsplit ./tests/run_tests {envdir} []
+
+[testenv:ksh]
+basepython=python2.7
+setenv = 
+  SHELL = /bin/ksh
+commands =  ksh ./tests/run_tests {envdir} []

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#!/bin/sh`
	`1`	`+# -- mode: shell-script --`
`2`	`2`
`3`	`3`	`test_dir=$(cd $(dirname $0) && pwd)`
`4`	`4`	`source "$test_dir/setup.sh"`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-#venv!/bin/sh`
	`1`	`+# -- mode: shell-script --`
`2`	`2`
`3`	`3`	`test_dir=$(cd $(dirname $0) && pwd)`
`4`	`4`	`source "$test_dir/setup.sh"`