From 14934a9479ad8db8d72e64d30bb5a199e09e79b6 Mon Sep 17 00:00:00 2001
From: Tan Jay Jun <tan@jayjun.com>
Date: Thu, 23 Apr 2020 01:33:30 +0800
Subject: [PATCH] fix: scope init tests to container processes only

---
 tests/unit/50_init_1.bats | 8 ++++++--
 tests/unit/50_init_2.bats | 8 ++++++--
 tests/unit/50_init_3.bats | 8 ++++++--
 3 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/tests/unit/50_init_1.bats b/tests/unit/50_init_1.bats
index 2572c9140..98581d63b 100644
--- a/tests/unit/50_init_1.bats
+++ b/tests/unit/50_init_1.bats
@@ -13,8 +13,12 @@ teardown() {
 }
 
 @test "(init) buildpack" {
-  deploy_app zombies-buildpack
-  run ps ax
+  source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+  local APP="zombies-buildpack"
+  deploy_app "$APP"
+  local CIDS=$(get_app_container_ids "$APP")
+
+  run "$DOCKER_BIN" container top "$CIDS"
   echo "output: $output"
   assert_output_contains "<defunct>" "0"
 }
diff --git a/tests/unit/50_init_2.bats b/tests/unit/50_init_2.bats
index 9515f52c2..c0b5d459a 100644
--- a/tests/unit/50_init_2.bats
+++ b/tests/unit/50_init_2.bats
@@ -13,8 +13,12 @@ teardown() {
 }
 
 @test "(init) dockerfile no tini" {
-  deploy_app zombies-dockerfile-no-tini
-  run ps auxf
+  source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+  local APP="zombies-dockerfile-no-tini"
+  deploy_app "$APP"
+  local CIDS=$(get_app_container_ids "$APP")
+  
+  run "$DOCKER_BIN" container top "$CIDS"
   echo "output: $output"
   assert_output_contains "<defunct>" "0"
 }
diff --git a/tests/unit/50_init_3.bats b/tests/unit/50_init_3.bats
index 71ad74035..77c354b1b 100644
--- a/tests/unit/50_init_3.bats
+++ b/tests/unit/50_init_3.bats
@@ -13,8 +13,12 @@ teardown() {
 }
 
 @test "(init) dockerfile with tini" {
-  deploy_app zombies-dockerfile-tini
-  run ps ax
+  source "$PLUGIN_CORE_AVAILABLE_PATH/common/functions"
+  local APP="zombies-dockerfile-tini"
+  deploy_app "$APP"
+  local CIDS=$(get_app_container_ids "$APP")
+
+  run "$DOCKER_BIN" container top "$CIDS"
   echo "output: $output"
   assert_output_contains "<defunct>" "0"
 }