Centralize setup of variables for tests.

dhellmann · dhellmann · commit adbfd8bf7d0e · 2012-04-08T14:40:42.000-04:00
Change WORKON_HOME and PROJECT_HOME for tests to make them unique across runs, allowing simultaneous test runs in different sandboxes.
diff --git a/tests/setup.sh b/tests/setup.sh
@@ -0,0 +1,6 @@
+# Setup globals used by the tests
+
+tmplocation=${TMPDIR:-/tmp}
+
+export WORKON_HOME="$(echo ${tmplocation}/WORKON_HOME.$$ | sed 's|//|/|g')"
+export PROJECT_HOME="$(echo ${tmplocation}/PROJECT_HOME.$$ | sed 's|//|/|g')"
diff --git a/tests/test.sh b/tests/test.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_add2virtualenv.sh b/tests/test_add2virtualenv.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_cd.sh b/tests/test_cd.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_cp.sh b/tests/test_cp.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 #unset HOOK_VERBOSE_OPTION
 
diff --git a/tests/test_deactivate.sh b/tests/test_deactivate.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_derive_workon_home.sh b/tests/test_derive_workon_home.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 TMP_WORKON_HOME="$WORKON_HOME"
 
 oneTimeSetUp() {
diff --git a/tests/test_dir_stack.sh b/tests/test_dir_stack.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 #unset HOOK_VERBOSE_OPTION
 
diff --git a/tests/test_hook_dir.sh b/tests/test_hook_dir.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_log_dir.sh b/tests/test_log_dir.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 setUp () {
     echo
diff --git a/tests/test_ls.sh b/tests/test_ls.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_mktmpenv.sh b/tests/test_mktmpenv.sh
@@ -1,8 +1,7 @@
 #!/bin/sh
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 
 oneTimeSetUp() {
diff --git a/tests/test_mkvirtualenv.sh b/tests/test_mkvirtualenv.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_mkvirtualenv_associate.sh b/tests/test_mkvirtualenv_associate.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_mkvirtualenv_install.sh b/tests/test_mkvirtualenv_install.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_mkvirtualenv_requirements.sh b/tests/test_mkvirtualenv_requirements.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_project.sh b/tests/test_project.sh
@@ -3,9 +3,7 @@
 #set -x
 
 test_dir=$(dirname $0)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
-export PROJECT_HOME="$(echo ${TMPDIR:-/tmp}/PROJECT_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_project_activate.sh b/tests/test_project_activate.sh
@@ -3,9 +3,7 @@
 #set -x
 
 test_dir=$(dirname $0)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
-export PROJECT_HOME="$(echo ${TMPDIR:-/tmp}/PROJECT_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_project_cd.sh b/tests/test_project_cd.sh
@@ -3,9 +3,7 @@
 #set -x
 
 test_dir=$(dirname $0)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
-export PROJECT_HOME="$(echo ${TMPDIR:-/tmp}/PROJECT_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_project_mk.sh b/tests/test_project_mk.sh
@@ -3,9 +3,7 @@
 #set -x
 
 test_dir=$(dirname $0)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
-export PROJECT_HOME="$(echo ${TMPDIR:-/tmp}/PROJECT_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_project_templates.sh b/tests/test_project_templates.sh
@@ -3,9 +3,7 @@
 #set -x
 
 test_dir=$(dirname $0)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
-export PROJECT_HOME="$(echo ${TMPDIR:-/tmp}/PROJECT_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     (cd "$test_dir/testtemplate" && rm -rf build && "$VIRTUAL_ENV/bin/python" setup.py install)
diff --git a/tests/test_rmvirtualenv.sh b/tests/test_rmvirtualenv.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_run_hook.sh b/tests/test_run_hook.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_support.sh b/tests/test_support.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_tempfile.sh b/tests/test_tempfile.sh
@@ -3,11 +3,9 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
+source "$test_dir/setup.sh"
 
-tmplocation=${TMPDIR:-/tmp}
-export WORKON_HOME="$(echo ${tmplocation}/WORKON_HOME | sed 's|//|/|g')"
-
-export HOOK_VERBOSE_OPTION=-v
+#export HOOK_VERBOSE_OPTION=-v
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_toggleglobalsitepackages.sh b/tests/test_toggleglobalsitepackages.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
diff --git a/tests/test_workon.sh b/tests/test_workon.sh
@@ -3,8 +3,7 @@
 #set -x
 
 test_dir=$(cd $(dirname $0) && pwd)
-
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+source "$test_dir/setup.sh"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
