fix(tests): call other tests scripts in local dir by explicit path

deis · Aug 30, 2014 · 3b7edd7 · 3b7edd7
1 parent 9bc583c
commit 3b7edd7
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/tests/bin/destroy-all-vagrants.sh b/tests/bin/destroy-all-vagrants.sh
@@ -8,3 +8,4 @@ VMS=$(vagrant global-status | grep deis | awk '{ print $5 }')
 for dir in $VMS; do
     cd $dir && vagrant destroy --force
 done
+rm -rf $HOME/VirtualBox\ VMs/deis*
diff --git a/tests/bin/test-integration.sh b/tests/bin/test-integration.sh
@@ -3,6 +3,7 @@
 # Preps a test environment and runs `make test-integration` with single-node vagrant.
 
 echo Testing ${DEIS_TEST_APP?}...
+THIS_DIR=$(cd $(dirname $0); pwd)  # absolute path
 
 # Environment reset and configuration
 rm -rf ~/.deis ~/.fleetctl ~/.ssh/known_hosts
@@ -13,7 +14,7 @@ cd ${GOPATH?}/src/github.com/deis/deis
 rm -rf tests/example-*
 
 # Vagrant provisioning
-tests/bin/halt-all-vagrant.sh
+$THIS_DIR/halt-all-vagrants.sh
 vagrant destroy --force
 vagrant up --provider virtualbox --provision