test cleanup and enhancement

Author: dhellmann

tests/test_mkvirtualenv.sh

@@ -3,13 +3,12 @@
 #set -x
 
 test_dir=$(dirname $0)
-source "$test_dir/../virtualenvwrapper.sh"
-
 export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
     mkdir -p "$WORKON_HOME"
+    source "$test_dir/../virtualenvwrapper.sh"
 }
 
 oneTimeTearDown() {
@@ -39,12 +38,12 @@ test_activates () {
 
 test_hooks () {
     export pre_test_dir=$(cd "$test_dir"; pwd)
-    echo "echo GLOBAL premkvirtualenv >> \"$pre_test_dir/catch_output\"" >> "$WORKON_HOME/premkvirtualenv"
+    echo "echo GLOBAL premkvirtualenv \`pwd\` \"\$@\" >> \"$pre_test_dir/catch_output\"" >> "$WORKON_HOME/premkvirtualenv"
     chmod +x "$WORKON_HOME/premkvirtualenv"
     echo "echo GLOBAL postmkvirtualenv >> $test_dir/catch_output" > "$WORKON_HOME/postmkvirtualenv"
     mkvirtualenv "env3"
     output=$(cat "$test_dir/catch_output")
-    expected="GLOBAL premkvirtualenv
+    expected="GLOBAL premkvirtualenv $WORKON_HOME env3
 GLOBAL postmkvirtualenv"
     assertSame "$expected" "$output"
     rm -f "$WORKON_HOME/premkvirtualenv"

tests/test_run_hook.sh

@@ -42,13 +42,15 @@ test_virtualenvwrapper_source_hook_permissions() {
 }
 
 test_virtualenvwrapper_run_hook_permissions() {
+    echo "#!/bin/sh" > "$WORKON_HOME/prermvirtualenv"
     echo "echo run $@ >> \"$test_dir/catch_output\"" >> "$WORKON_HOME/prermvirtualenv"
     chmod -x "$WORKON_HOME/prermvirtualenv"
     touch "$test_dir/catch_output"
-    virtualenvwrapper_run_hook "pre_rmvirtualenv" "foo"
+    error=$(virtualenvwrapper_run_hook "pre_rmvirtualenv" "foo" 2>&1 | grep "ERROR")
     output=$(cat "$test_dir/catch_output")
     expected=""
     assertSame "$expected" "$output"
+    assertSame "virtualenvwrapper.user_scripts ERROR: Could not run $WORKON_HOME/prermvirtualenv. [Errno 13] Permission denied" "$error"
 }
 
 . "$test_dir/shunit2"

tests/test_workon.sh

@@ -3,13 +3,13 @@
 #set -x
 
 test_dir=$(dirname $0)
-source "$test_dir/../virtualenvwrapper.sh"
 
 export WORKON_HOME="${TMPDIR:-/tmp}/WORKON_HOME"
 
 oneTimeSetUp() {
     rm -rf "$WORKON_HOME"
     mkdir -p "$WORKON_HOME"
+    source "$test_dir/../virtualenvwrapper.sh"
     mkvirtualenv "env1"
 }
 
@@ -70,8 +70,8 @@ test_deactivate_hooks () {
 
     for t in pre post
     do
-        echo "echo GLOBAL ${t}deactivate >> $test_dir/catch_output" > "$WORKON_HOME/${t}deactivate"
-        echo "echo ENV ${t}deactivate >> $test_dir/catch_output" > "$WORKON_HOME/env1/bin/${t}deactivate"
+        echo "echo GLOBAL ${t}deactivate \$VIRTUALENVWRAPPER_LAST_VIRTUAL_ENV >> $test_dir/catch_output" > "$WORKON_HOME/${t}deactivate"
+        echo "echo ENV ${t}deactivate \$VIRTUALENVWRAPPER_LAST_VIRTUAL_ENV >> $test_dir/catch_output" > "$WORKON_HOME/env1/bin/${t}deactivate"
     done
 
     touch "$test_dir/catch_output"
@@ -81,8 +81,8 @@ test_deactivate_hooks () {
     output=$(cat "$test_dir/catch_output")
     expected="ENV predeactivate
 GLOBAL predeactivate
-ENV postdeactivate
-GLOBAL postdeactivate"
+ENV postdeactivate $WORKON_HOME/env1
+GLOBAL postdeactivate $WORKON_HOME/env1"
     assertSame "$expected" "$output"
 
     for t in pre post