Merge pull request #4034 from dokku/quieter-test-helper

Teardown apps and containers in global teardown

tests/unit/test_helper.bash

@@ -21,6 +21,10 @@ global_setup() {
   [[ ! -f "${BATS_PARENT_TMPNAME}.skip" ]] || skip "$SKIPPED_TEST_ERR_MSG"
 
   free -m
+}
+
+global_teardown() {
+  [[ -n "$BATS_TEST_COMPLETED" ]] || touch "${BATS_PARENT_TMPNAME}.skip"
   apps=$(dokku --quiet apps:list)
   if [[ -n "${apps}" ]]; then
     dokku --quiet apps:list | xargs -n1 dokku --force apps:destroy
@@ -31,10 +35,6 @@ global_setup() {
   fi
 }
 
-global_teardown() {
-  [[ -n "$BATS_TEST_COMPLETED" ]] || touch "${BATS_PARENT_TMPNAME}.skip"
-}
-
 # test functions
 flunk() {
   {