Make add2virtualenv tests work again, add new test code for new features.

Author: miracle2k

tests/test_add2virtualenv.sh

@@ -23,10 +23,17 @@ setUp () {
 
 test_add2virtualenv () {
     mkvirtualenv "pathtest"
-    add2virtualenv "/full/path"
+    full_path=$(pwd)
+    add2virtualenv "$full_path"
     cdsitepackages
-    path_file="./virtualenv_path_extensions.pth"
-    assertTrue "No /full/path in `cat $path_file`" "grep /full/path $path_file"
+    # Check contents of path file
+    path_file="./_virtualenv_path_extensions.pth"
+    assertTrue "No $full_path in `cat $path_file`" "grep $full_path $path_file"
+    assertTrue "No path insert code in `cat $path_file`" "grep sys.__egginsert $path_file"
+    # Check the path we inserted is actually at the top
+    expected=$full_path
+    actual=$($WORKON_HOME/pathtest/bin/python -c "import sys; print sys.path[1]")
+    assertSame "$expected" "$actual"
     cd -
 }
 
@@ -36,10 +43,21 @@ test_add2virtualenv_relative () {
     base_dir=$(basename $(pwd))
     add2virtualenv "../$base_dir"
     cdsitepackages
-    path_file="./virtualenv_path_extensions.pth"
+    path_file="./_virtualenv_path_extensions.pth"
     assertTrue "No $parent_dir/$base_dir in \"`cat $path_file`\"" "grep \"$parent_dir/$base_dir\" $path_file"
     cd - >/dev/null 2>&1
 }
 
+test_add2virtualenv_delete () {
+    mkvirtualenv "pathtest"
+    add2virtualenv "/full/path"
+    add2virtualenv -d "/full/path"
+    cdsitepackages
+    # Check contents of path file
+    path_file="./_virtualenv_path_extensions.pth"
+    assertFalse "/full/path in `cat $path_file`" "grep /full/path $path_file"
+    cd -
+}
+
 
 . "$test_dir/shunit2"