test cleanup with slight performance boost

tests/unit/ps-dockerfile.bats

@@ -10,33 +10,18 @@ teardown() {
   destroy_app
 }
 
+# @test "ps (dockerfile)" {
+#   # CI support: 'Ah. I just spoke with our Docker expert --
+#   # looks like docker exec is built to work with docker-under-libcontainer,
+#   # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
+#   skip "circleci does not support docker exec at the moment."
+#   run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
+#   echo "output: "$output
+#   echo "status: "$status
+#   assert_success
+# }
+
 @test "ps (dockerfile)" {
-  # CI support: 'Ah. I just spoke with our Docker expert --
-  # looks like docker exec is built to work with docker-under-libcontainer,
-  # but we're using docker-under-lxc. I don't have an estimated time for the fix, sorry
-  skip "circleci does not support docker exec at the moment."
-  run bash -c "dokku ps $TEST_APP | grep -q \"node web.js\""
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-}
-
-@test "ps:start (dockerfile)" {
-  run bash -c "dokku ps:stop $TEST_APP"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-  run bash -c "dokku ps:start $TEST_APP"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-  run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)"
-  echo "output: "$output
-  echo "status: "$status
-  assert_success
-}
-
-@test "ps:stop (dockerfile)" {
   run bash -c "dokku ps:stop $TEST_APP"
   echo "output: "$output
   echo "status: "$status
@@ -45,9 +30,16 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_failure
-}
 
-@test "ps:restart (dockerfile)" {
+  run bash -c "dokku ps:start $TEST_APP"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+  run bash -c "docker ps -q --no-trunc | grep -q $(< $DOKKU_ROOT/$TEST_APP/CONTAINER)"
+  echo "output: "$output
+  echo "status: "$status
+  assert_success
+
   run bash -c "dokku ps:restart $TEST_APP"
   echo "output: "$output
   echo "status: "$status
@@ -56,9 +48,7 @@ teardown() {
   echo "output: "$output
   echo "status: "$status
   assert_success
-}
 
-@test "ps:rebuild (dockerfile)" {
   run bash -c "dokku ps:rebuild $TEST_APP"
   echo "output: "$output
   echo "status: "$status