From 69ed7342b1faaf33e2b315f0c20fef9b2bdcc7e5 Mon Sep 17 00:00:00 2001
From: Navid Shaikh <nshaikh@redhat.com>
Date: Thu, 4 Jul 2019 12:11:28 +0530
Subject: [PATCH] Update e2e tests

---
 openshift/e2e-tests-openshift.sh | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/openshift/e2e-tests-openshift.sh b/openshift/e2e-tests-openshift.sh
index a6f6e7021f..2d16e9563d 100755
--- a/openshift/e2e-tests-openshift.sh
+++ b/openshift/e2e-tests-openshift.sh
@@ -178,21 +178,23 @@ function run_e2e_tests(){
   # adding the basic workflow tests for now
   # TODO: Link the integration tests written in go here once the PR is merged upstream
 
-  ./kn service create hello --image $KN_DEFAULT_TEST_IMAGE -e TARGET=Knative || failed=1
-  sleep 20
-  ./kn service get || failed=1
-  ./kn service update hello --env TARGET=kn || failed=1
-  sleep 20
-  ./kn revision get || failed=1
-  ./kn service get || failed=1
-  ./kn service create hello --force --image $KN_DEFAULT_TEST_IMAGE -e TARGET=Awesome || failed=1
-  ./kn service create foo --force --image $KN_DEFAULT_TEST_IMAGE -e TARGET=foo || failed=1
-  sleep 20
-  ./kn revision get || failed=1
-  ./kn service get || failed=1
-  ./kn service describe hello || failed=1
-  ./kn service delete hello || failed=1
-  ./kn service delete foo || failed=1
+  ./kn service create svc1 --async --image $KN_DEFAULT_TEST_IMAGE -e TARGET=Knative || fail_test
+  ./kn service create hello --wait-timeout 120 --image $KN_DEFAULT_TEST_IMAGE -e TARGET=Knative || fail_test
+  ./kn service list hello || fail_test
+  ./kn service update hello --env TARGET=kn || fail_test
+  ./kn revision list hello || fail_test
+  ./kn service list || fail_test
+  ./kn service create hello --wait-timeout 120 --force --image $KN_DEFAULT_TEST_IMAGE -e TARGET=Awesome || fail_test
+  ./kn service create foo --wait-timeout 120 --force --image $KN_DEFAULT_TEST_IMAGE -e TARGET=foo || fail_test
+  ./kn revision list || fail_test
+  ./kn service list || fail_test
+  ./kn service describe hello || fail_test
+  ./kn service describe svc1 || fail_test
+  ./kn route list || fail_test
+  ./kn service delete hello || fail_test
+  ./kn service delete foo || fail_test
+  ./kn service list | grep -q svc1 || fail_test
+  ./kn service delete svc1 || fail_test
 
   return $failed
 }