quiet tests and add intermediate check for delete

Author: dhellmann

tests/test_add2virtualenv.sh

@@ -22,45 +22,45 @@ setUp () {
 }
 
 test_add2virtualenv () {
-    mkvirtualenv "pathtest"
+    mkvirtualenv "pathtest" >/dev/null 2>&1
     full_path=$(pwd)
     add2virtualenv "$full_path"
     cdsitepackages
     # 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"
+    assertTrue "No $full_path in $(cat $path_file)" "grep -q $full_path $path_file"
+    assertTrue "No path insert code in $(cat $path_file)" "grep -q sys.__egginsert $path_file"
     # Check the path we inserted is actually at the top
-    expected=$full_path
+    expected="$full_path"
     actual=$($WORKON_HOME/pathtest/bin/python -c "import sys; print sys.path[1]")
     assertSame "$expected" "$actual"
-
     # Make sure the temporary file created
     # during the edit was removed
     assertFalse "Temporary file ${path_file}.tmp still exists" "[ -f ${path_file}.tmp ]"
-
-    cd -
+    cd - >/dev/null 2>&1
 }
 
 test_add2virtualenv_relative () {
-    mkvirtualenv "pathtest"
+    mkvirtualenv "pathtest" >/dev/null 2>&1
     parent_dir=$(dirname $(pwd))
     base_dir=$(basename $(pwd))
     add2virtualenv "../$base_dir"
     cdsitepackages
     path_file="./_virtualenv_path_extensions.pth"
-    assertTrue "No $parent_dir/$base_dir in \"`cat $path_file`\"" "grep \"$parent_dir/$base_dir\" $path_file"
+    assertTrue "No $parent_dir/$base_dir in \"`cat $path_file`\"" "grep -q \"$parent_dir/$base_dir\" $path_file"
     cd - >/dev/null 2>&1
 }
 
 test_add2virtualenv_delete () {
-    mkvirtualenv "pathtest"
+    path_file="./_virtualenv_path_extensions.pth"
+    mkvirtualenv "pathtest" >/dev/null 2>&1
+    cdsitepackages
+    # Make sure it was added
     add2virtualenv "/full/path"
+    assertTrue "No $full_path in $(cat $path_file)" "grep -q $full_path $path_file"
+    # Remove it and verify that change
     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"
+    assertFalse "/full/path in `cat $path_file`" "grep -q /full/path $path_file"
     cd -
 }