Slight test modification. Make it slighly better than watching pain dry. (Print dots while waiting for long foreground jobs to finish.)

Author: Tom Barnes

src/integration-tests/introspector/introspectTest.sh

@@ -42,6 +42,7 @@ SCRIPTPATH="$( cd "$(dirname "$0")" > /dev/null 2>&1 ; pwd -P )"
 SOURCEPATH="`echo $SCRIPTPATH | sed 's/weblogic-kubernetes-operator.*/weblogic-kubernetes-operator/'`"
 traceFile=${SOURCEPATH}/operator/src/main/resources/scripts/traceUtils.sh
 source ${traceFile}
+source ${SCRIPTPATH}/util_dots.sh
 [ $? -ne 0 ] && echo "Error: missing file ${traceFile}" && exit 1
 
 # Set TRACE_INCLUDE_FILE to true to cause tracing to include filename & line number.
@@ -172,11 +173,15 @@ function cleanup() {
   #   2 - delete contents of k8s weblogic domain PV/PVC
   #       (if CREATE_DOMAIN has been set to "true")
 
+  tracen "Info: Waiting for cleanup.sh to complete."
+  printdots_start
   DELETE_FILES=${CREATE_DOMAIN:-false} \
     ${SOURCEPATH}/src/integration-tests/bash/cleanup.sh 2>&1 > \
     ${test_home}/cleanup.out
+  status=$?
+  printdots_end
 
-  if [ $? -ne 0 ]; then
+  if [ $status -ne 0 ]; then
     trace "Error:  cleanup failed.   Cleanup output:"
     cat ${test_home}/cleanup.out
     exit 1
@@ -210,15 +215,20 @@ function runJob() {
 
   # Run the job
 
+  tracen "Info: Waiting for job to complete."
+  printdots_start
   env \
     KUBECONFIG=$KUBECONFIG \
     JOB_YAML=${test_home}/${yaml_file} \
     JOB_NAME=${job_name} \
     NAMESPACE=$NAMESPACE \
     ${SCRIPTPATH}/util_job.sh \
     2>&1 > ${test_home}/job-${1}.out
+  local status=$?
+  printdots_end
 
-  if [ ! $? -eq 0 ]; then
+  if [ ! $status -eq 0 ]; then
+    printdots_end
     trace "Error:  job failed, job contents"
     cat ${test_home}/job-${1}.out
     trace "Error:  end of failed job contents"
@@ -513,7 +523,7 @@ function deployPod() {
     sleep 1
     status=`kubectl get pods -n $NAMESPACE 2>&1 | egrep $pod_name | awk '{print $2}'`
   done
-  echo
+  echo "  ($((SECONDS - startsecs)) seconds)"
 }
 
 function deploySinglePodService() {
@@ -606,12 +616,16 @@ deploySinglePodService ${MANAGED_SERVER_NAME_BASE?}1 ${MANAGED_SERVER_PORT?} 308
 trace "Info: Checking beans to see if sit-cfg took effect.  Input file 'checkBeans.input', output file '$test_home/checkBeans.out'."
 kubectl cp checkBeans.input domain1-admin-server:/shared/checkBeans.input || exit 1
 kubectl cp checkBeans.py domain1-admin-server:/shared/checkBeans.py || exit 1
+tracen "Info: Waiting for WLST checkBeans.py to complete."
+printdots_start
 kubectl exec -it domain1-admin-server \
   wlst.sh /shared/checkBeans.py \
     weblogic welcome1 t3://domain1-admin-server:7001 \
     /shared/checkBeans.input \
     > $test_home/checkBeans.out 2>&1
-if [ $? -ne 0 ]; then
+status=$?
+printdots_end
+if [ $status -ne 0 ]; then
   trace "Error:  checkBeans failed, see '$test_home/checkBeans.out'."
   exit 1
 fi

src/integration-tests/introspector/util_dots.sh

@@ -0,0 +1,69 @@
+# !/bin/sh
+
+# Copyright 2018, Oracle Corporation and/or its affiliates. All rights reserved.
+# Licensed under the Universal Permissive License v 1.0 as shown at http://oss.oracle.com/licenses/upl.
+
+# 
+# Description:
+# ------------
+#
+# This helper utility prints dots using a background process 
+# while a foreground process runs.  Use it to provide feedback
+# while you wait for the foreground process to finish.
+#
+# It stops printing dots when any of the following are true:
+#   - printdots_end is called
+#   - the process that called printdots_start is no longer around
+#   - more than 120 seconds has passed
+#
+# Usage example:
+#    source ./util_dots.sh
+#
+#    echo -n "Hello"
+#    printdots_start 1
+#    sleep 6
+#    printdots_end
+#
+# The first parameter of printdots_start is the number of seconds
+# to wait before each dot - default is 2 seconds.
+#
+# 'printdots_end' calls 'echo' without any parameters.
+#
+
+printdots_inner() {
+  local start_pids=""
+  local dotsfile=$1
+  local begin_sec=$SECONDS
+  [ -f "$dotsfile" ] || return
+  while [ 1 -eq 1 ]; do
+    [ "$start_pids" = "" ] && start_pids="`ps -o ppid=`"
+    sleep ${2:-1}
+
+    # if parent pids changed, then our parent died and we should exit
+    local end_pids="`ps -o ppid=`"
+    [ "$start_pids" = "$end_pids" ] || break
+
+    # if too much time has passed, then exit
+    [ $((SECONDS-begin_sec)) -lt 120 ] || break
+
+    # if parent deleted our temp file, then exit
+    [ -f "$dotsfile" ] || break
+
+    echo -n "."
+  done
+  rm -f $dotsfile
+}
+
+printdots_start() {
+  dotsfile=$(mktemp /tmp/dots.`basename $0`.XXXXXXXXX)
+  touch $dotsfile
+  printdots_inner $dotsfile $1 &
+  printdots_pid=$!
+  printdots_time_start=$SECONDS
+}
+
+printdots_end() {
+  rm -f $dotsfile
+  wait $printdots_pid > /dev/null 2>&1
+  echo "  ($((SECONDS - printdots_time_start)) seconds)"
+}