Doug Hellmann avatar Doug Hellmann committed 9490141

fix tempdir tests to work on ubuntu 10.10

Comments (0)

Files changed (2)

tests/test_tempfile.sh

 
 test_dir=$(cd $(dirname $0) && pwd)
 
-export WORKON_HOME="$(echo ${TMPDIR:-/tmp}/WORKON_HOME | sed 's|//|/|g')"
+tmplocation=${TMPDIR:-/tmp}
+export WORKON_HOME="$(echo ${tmplocation}/WORKON_HOME | sed 's|//|/|g')"
 
 export HOOK_VERBOSE_OPTION=-v
 
     filename=$(virtualenvwrapper_tempfile hook)
     assertTrue "Filename is empty" "[ ! -z \"$filename\" ]"
     rm -f $filename
-    comparable_tmpdir=$(echo $TMPDIR | sed 's|/$||')
+    comparable_tmpdir=$(echo $tmplocation | sed 's|/$||')
     comparable_dirname=$(dirname $filename | sed 's|/$||')
-    assertSame "TMPDIR and path not the same for $filename" "$comparable_tmpdir" "$comparable_dirname"
+    assertSame "Temporary directory \"$tmplocation\" and path not the same for $filename" "$comparable_tmpdir" "$comparable_dirname"
     assertTrue "virtualenvwrapper-hook not in filename." "echo $filename | grep virtualenvwrapper-hook"
 }
 
 test_no_such_tmpdir () {
     old_tmpdir="$TMPDIR"
-    TMPDIR="$TMPDIR/does-not-exist"
+    export TMPDIR="$tmplocation/does-not-exist"
     virtualenvwrapper_run_hook "initialize" >/dev/null 2>&1
     RC=$?
     assertSame "Unexpected exit code $RC" "1" "$RC"
 
 test_tmpdir_not_writable () {
     old_tmpdir="$TMPDIR"
-    TMPDIR="$TMPDIR/cannot-write"
+    export TMPDIR="$tmplocation/cannot-write"
     mkdir "$TMPDIR"
     chmod ugo-w "$TMPDIR"
     virtualenvwrapper_run_hook "initialize" >/dev/null 2>&1
 # 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.
 # 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
+#[testenv:py26]
+#basepython=/Library/Frameworks/Python.framework/Versions/2.6/bin/python2.6
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.