From e75aadff15461db7501e8337e186d4e5af5862aa Mon Sep 17 00:00:00 2001
From: Jose Diaz-Gonzalez <email@josediazgonzalez.com>
Date: Sun, 21 Jun 2020 17:12:24 -0400
Subject: [PATCH] fix: teardown apps and containers in global teardown

---
 tests/unit/test_helper.bash | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tests/unit/test_helper.bash b/tests/unit/test_helper.bash
index 2cbfc2e15..9e3535580 100644
--- a/tests/unit/test_helper.bash
+++ b/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() {
   {