Bypass the test for missing virtualenv if the user has it installed to the subset of the path needed for the shunit2 framework to function properly.

Add a test for having VIRTUALENVWRAPER_VIRTUALENV set to a program that does not exist.

Author: dhellmann

tests/test_mkvirtualenv.sh

@@ -55,10 +55,18 @@ GLOBAL postmkvirtualenv"
 }
 
 test_no_virtualenv () {
+	# Find "which" before we change the path
+	which=$(which which)
     old_path="$PATH"
     PATH="/bin:/usr/sbin:/sbin"
-    assertFalse "Found virtualenv in $(which virtualenv)" "which virtualenv"
-    mkvirtualenv should_not_be_created 2>/dev/null
+    venv=$($which virtualenv 2>/dev/null)
+	if [ ! -z "$venv" ]
+	then
+        echo "FOUND \"$venv\" in PATH so skipping this test"
+        export PATH="$old_path"
+		return 0
+	fi
+    mkvirtualenv should_not_be_created >/dev/null 2>&1
     RC=$?
     # Restore the path before testing because
     # the test script depends on commands in the
@@ -111,6 +119,25 @@ test_mkvirtualenv_args () {
     unset VIRTUALENVWRAPPER_VIRTUALENV_ARGS
 }
 
+test_no_such_virtualenv () {
+    VIRTUALENVWRAPPER_VIRTUALENV=/path/to/missing/program
+
+    echo "#!/bin/sh" > "$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" >/dev/null 2>&1
+    output=$(cat "$test_dir/catch_output" 2>/dev/null)
+    workon_home_as_pwd=$(cd $WORKON_HOME; pwd)
+    expected=""
+    assertSame "$expected" "$output"
+    rm -f "$WORKON_HOME/premkvirtualenv"
+    rm -f "$WORKON_HOME/postmkvirtualenv"
+
+    VIRTUALENVWRAPPER_VIRTUALENV=virtualenv
+}
+
 test_virtualenv_fails () {
     # Test to reproduce the conditions in issue #76
     # https://bitbucket.org/dhellmann/virtualenvwrapper/issue/76/