From 63758191950c0d96893e5c68dac8e7f9933b99ff Mon Sep 17 00:00:00 2001
From: Ta-Ching Chen <contact@tachingchen.com>
Date: Thu, 26 Apr 2018 14:39:16 +0800
Subject: [PATCH] Fix test cases occasional failure (#647)

---
 test/tests/test_env_vars.sh        | 10 +++++++---
 test/tests/test_node_hello_http.sh |  4 ++--
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/test/tests/test_env_vars.sh b/test/tests/test_env_vars.sh
index 1a2d7340..6f2f848f 100755
--- a/test/tests/test_env_vars.sh
+++ b/test/tests/test_env_vars.sh
@@ -43,9 +43,13 @@ fi
 getPodName() {
     NS=$1
     POD=$2
-    kubectl -n ${NS} get po -o jsonpath='{range .items[*]}{.metadata.name}{"\n"}{end}' \
+    # find pod is ready to serve
+    JSONPATH="{range .items[*]}{'\n'}{@.metadata.name}:{range @.status.conditions[*]}{@.type}={@.status};{end}{end}"
+    kubectl -n ${NS} get po -o jsonpath="$JSONPATH" \
+        | grep "Ready=True" \
         | grep ${POD} \
-        | head -n 1
+        | head -n 1 \
+        | cut -f1 -d":"
 }
 
 # retry function adapted from:
@@ -53,7 +57,7 @@ getPodName() {
 function retry {
   local n=1
   local max=5
-  local delay=5
+  local delay=10 # pods take time to get ready
   while true; do
     "$@" && break || {
       if [[ ${n} -lt ${max} ]]; then
diff --git a/test/tests/test_node_hello_http.sh b/test/tests/test_node_hello_http.sh
index a89bcb76..cda19717 100755
--- a/test/tests/test_node_hello_http.sh
+++ b/test/tests/test_node_hello_http.sh
@@ -30,7 +30,7 @@ response=$(curl http://$FISSION_ROUTER/$fn)
 log "Checking for valid response"
 echo $response | grep -i hello
 
-# crappy cleanup, improve this later
-kubectl get httptrigger -o name | tail -1 | cut -f2 -d'/' | xargs kubectl delete httptrigger
+routeid=$(fission route list|grep "$fn"|awk '{print $1}')
+fission route delete --name $routeid || true
 
 log "All done."