add tests to make sure we override cd properly

Change-Id: Ifb96741a872e257d8f350d8e8b6c0bbe2b6c409c

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch pr/5
# Changes to be committed:
#   (use "git reset HEAD^1 <file>..." to unstage)
#
#	modified:   tests/test_cd.sh
#	new file:   tests/test_cd_alias.sh
#	modified:   tests/test_ls.sh
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   tox.ini
#

Author: dhellmann

tests/test_cd.sh

@@ -8,7 +8,7 @@ oneTimeSetUp() {
     mkdir -p "$WORKON_HOME"
     unset VIRTUAL_ENV
     source "$test_dir/../virtualenvwrapper.sh"
-    mkvirtualenv cd-test
+    mkvirtualenv cd-test >/dev/null 2>&1
     deactivate
 }
 
@@ -25,13 +25,17 @@ tearDown () {
     deactivate >/dev/null 2>&1
 }
 
+cd () {
+    fail "Should not be using override cd function"
+}
+
 test_cdvirtual() {
     start_dir="$(pwd)"
     cdvirtualenv
     assertSame "$VIRTUAL_ENV" "$(pwd)"
     cdvirtualenv bin
     assertSame "$VIRTUAL_ENV/bin" "$(pwd)"
-    cd "$start_dir"
+    virtualenvwrapper_cd "$start_dir"
 }
 
 test_cdsitepackages () {
@@ -40,7 +44,7 @@ test_cdsitepackages () {
     pyvers=$(python -V 2>&1 | cut -f2 -d' ' | cut -f1-2 -d.)
     sitepackages="$VIRTUAL_ENV/lib/python${pyvers}/site-packages"
     assertSame "$sitepackages" "$(pwd)"
-    cd "$start_dir"
+    virtualenvwrapper_cd "$start_dir"
 }
 
 test_cdsitepackages_with_arg () {
@@ -50,7 +54,7 @@ test_cdsitepackages_with_arg () {
     mkdir -p "${sitepackage_subdir}"
     cdsitepackages subdir
     assertSame "$sitepackage_subdir" "$(pwd)"
-    cd "$start_dir"
+    virtualenvwrapper_cd "$start_dir"
 }
 
 test_cdvirtualenv_no_workon_home () {
@@ -65,7 +69,7 @@ test_cdvirtualenv_no_workon_home () {
 test_cdsitepackages_no_workon_home () {
     deactivate 2>&1
     old_home="$WORKON_HOME"
-    cd "$WORKON_HOME"
+    virtualenvwrapper_cd "$WORKON_HOME"
     export WORKON_HOME="$WORKON_HOME/not_there"
     assertFalse "Was able to change to site-packages" cdsitepackages
     assertSame "$old_home" "$(pwd)"

tests/test_cd_alias.sh

@@ -0,0 +1,36 @@
+# -*- mode: shell-script -*-
+
+test_dir=$(cd $(dirname $0) && pwd)
+source "$test_dir/setup.sh"
+
+oneTimeSetUp() {
+    rm -rf "$WORKON_HOME"
+    mkdir -p "$WORKON_HOME"
+    unset VIRTUAL_ENV
+    source "$test_dir/../virtualenvwrapper.sh"
+    mkvirtualenv cd-test >/dev/null 2>&1
+    deactivate
+    alias cd='fail "Should not be using override cd function"'
+}
+
+oneTimeTearDown() {
+    rm -rf "$WORKON_HOME"
+}
+
+setUp () {
+    echo
+    workon cd-test
+}
+
+tearDown () {
+    deactivate >/dev/null 2>&1
+}
+
+test_cd() {
+    start_dir="$(pwd)"
+    virtualenvwrapper_cd "$VIRTUAL_ENV"
+    assertSame "$VIRTUAL_ENV" "$(pwd)"
+    virtualenvwrapper_cd "$start_dir"
+}
+
+. "$test_dir/shunit2"