From 84ceaf1943d98a98f823ec6ccb600da07e47406e Mon Sep 17 00:00:00 2001
From: Jordan Liggitt <jliggitt@redhat.com>
Date: Tue, 10 Jul 2018 14:52:48 -0400
Subject: [PATCH] ensure rs pod cleanup happens

---
 test/cmd/apps.sh | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/test/cmd/apps.sh b/test/cmd/apps.sh
index 7f4b029b079..2269cf52298 100755
--- a/test/cmd/apps.sh
+++ b/test/cmd/apps.sh
@@ -494,13 +494,15 @@ run_rs_tests() {
   kube::log::status "Deleting rs"
   kubectl delete rs frontend "${kube_flags[@]}"
   # Post-condition: no pods from frontend replica set
-  kube::test::get_object_assert 'pods -l "tier=frontend"' "{{range.items}}{{$id_field}}:{{end}}" ''
+  kube::test::wait_object_assert 'pods -l "tier=frontend"' "{{range.items}}{{$id_field}}:{{end}}" ''
 
   ### Create and then delete a replica set with cascade=false, make sure it doesn't delete pods.
   # Pre-condition: no replica set exists
   kube::test::get_object_assert rs "{{range.items}}{{$id_field}}:{{end}}" ''
   # Command
   kubectl create -f hack/testdata/frontend-replicaset.yaml "${kube_flags[@]}"
+  # wait for all 3 pods to be set up
+  kube::test::wait_object_assert 'pods -l "tier=frontend"' "{{range.items}}{{$pod_container_name_field}}:{{end}}" 'php-redis:php-redis:php-redis:'
   kube::log::status "Deleting rs"
   kubectl delete rs frontend "${kube_flags[@]}" --cascade=false
   # Wait for the rs to be deleted.