Merge pull request #2264 from mboersma/clean-test-orphans

fix(tests): remove orphaned test containers in cleanup

Author: mboersma

tests/bin/test-setup.sh

@@ -89,6 +89,7 @@ function cleanup {
     ${GOPATH}/src/github.com/deis/deis/tests/bin/destroy-all-vagrants.sh
     VBoxManage list vms | grep deis | sed -n -e 's/^.* {\(.*\)}/\1/p' | xargs -L1 -I {} VBoxManage unregistervm {} --delete
     vagrant global-status --prune
+    docker rm -f -v `docker ps | grep deis- | awk '{print $1}'` 2>/dev/null
     log_phase "Test run complete"
 }