Show what is being executed as a check

lukaszachy · Dec 15, 2017 · ffc4f81 · ffc4f81
1 parent a6401ff
commit ffc4f81
Showing 1 changed file with 20 additions and 2 deletions.
diff --git a/test-lib-openshift.sh b/test-lib-openshift.sh
@@ -371,9 +371,18 @@ function ct_os_test_s2i_app_func() {
   local ip=$(ct_os_get_service_ip "${service_name}")
   local check_command_exp=$(echo "$check_command" | sed -e "s/<IP>/$ip/g")
 
-  eval "$check_command_exp"
+  echo "  Checking APP using $check_command_exp ..."
+  local result=0
+  eval "$check_command_exp" || result=1
+
+  if [ $result -eq 0 ] ; then
+    echo "  Check passed."
+  else
+    echo "  Check failed."
+  fi
 
   ct_os_delete_project
+  return $result
 }
 
 # ct_os_test_s2i_app IMAGE APP CONTEXT_DIR EXPECTED_OUTPUT [PORT, PROTOCOL, RESPONSE_CODE, OC_ARGS, ... ]
@@ -455,9 +464,18 @@ function ct_os_test_template_app_func() {
   local ip=$(ct_os_get_service_ip "${service_name}")
   local check_command_exp=$(echo "$check_command" | sed -e "s/<IP>/$ip/g")
 
-  eval "$check_command_exp"
+  echo "  Checking APP using $check_command_exp ..."
+  local result=0
+  eval "$check_command_exp" || result=1
+
+  if [ $result -eq 0 ] ; then
+    echo "  Check passed."
+  else
+    echo "  Check failed."
+  fi
 
   ct_os_delete_project
+  return $result
 }
 
 # params: