eventscripts: Auto-start/stop services in background

If $CTDB_SERVICE_AUTOSTARTSTOP="yes" then service start/stop is done
in the background with logging.

Fix some unit tests for samba and winbind.

Signed-off-by: Martin Schwenke <martin@meltin.net>

(This used to be ctdb commit 3a3dae4cb5ec8b4b8381a4013adda25b87641f3a)

1 files changed, 18 insertions, 2 deletions

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index e572a5dba7..56d09fa980 100644
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -23,6 +23,9 @@ fi
 mkdir -p "$EVENTSCRIPTS_TESTS_VAR_DIR"
 export CTDB_VARDIR="$EVENTSCRIPTS_TESTS_VAR_DIR/ctdb"
 
+export CTDB_LOGFILE="${EVENTSCRIPTS_TESTS_VAR_DIR}/log.ctdb"
+touch "$CTDB_LOGFILE" || die "Unable to create CTDB_LOGFILE=$CTDB_LOGFILE"
+
 if [ -d "${TEST_SUBDIR}/etc" ] ; then    
     cp -a "${TEST_SUBDIR}/etc" "$EVENTSCRIPTS_TESTS_VAR_DIR"
     export CTDB_ETCDIR="${EVENTSCRIPTS_TESTS_VAR_DIR}/etc"
@@ -763,7 +766,7 @@ simple_test_event ()
     $_passed || return 1
 
     event="$1" ; shift
-    echo "##################################################"
+    echo "=================================================="
     simple_test "$@"
 }
 
@@ -773,13 +776,26 @@ simple_test_command ()
     : ${_passed:=true}
     $_passed || return 1
 
-    echo "##################################################"
+    echo "=================================================="
     echo "Running command \"$*\""
     _out=$("$@" 2>&1)
 
     result_check
 }
 
+check_ctdb_logfile ()
+{
+    # If something has previously failed then don't continue.
+    : ${_passed:=true}
+    $_passed || return 1
+
+    echo "=================================================="
+    echo "Checking CTDB_LOGFILE=\"${CTDB_LOGFILE}\""
+    _out=$(cat "$CTDB_LOGFILE" 2>&1)
+
+    result_check
+}
+
 # Run an eventscript iteratively.
 # - 1st argument is the number of iterations.
 # - 2nd argument is something to eval to do setup for every iteration.