From a757e07600d38692c600847d8a169936a7268f4b Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Sat, 7 Jul 2018 22:07:54 +1000 Subject: [PATCH] ctdb-tests: Ensure some event scripts are enabled for cluster tests Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tests/complex/00_ctdb_init.sh | 24 ++++++++++++++++++++++++ ctdb/tests/scripts/integration.bash | 20 ++++++++++++++++++++ ctdb/tests/simple/00_ctdb_init.sh | 4 ++++ 3 files changed, 48 insertions(+) create mode 100755 ctdb/tests/complex/00_ctdb_init.sh diff --git a/ctdb/tests/complex/00_ctdb_init.sh b/ctdb/tests/complex/00_ctdb_init.sh new file mode 100755 index 00000000000..f4905e81a58 --- /dev/null +++ b/ctdb/tests/complex/00_ctdb_init.sh @@ -0,0 +1,24 @@ +#!/bin/bash + +test_info() +{ + cat </dev/null 2>&1 || true + +ctdb_enable_cluster_test_event_scripts + +ctdb_start_all diff --git a/ctdb/tests/scripts/integration.bash b/ctdb/tests/scripts/integration.bash index 96762813b74..c3c573c9622 100644 --- a/ctdb/tests/scripts/integration.bash +++ b/ctdb/tests/scripts/integration.bash @@ -735,6 +735,26 @@ db_ctdb_tstore_dbseqnum () ####################################### +# Enables all of the event scripts used in cluster tests, except for +# the mandatory scripts +ctdb_enable_cluster_test_event_scripts () +{ + local scripts=" + 06.nfs + 10.interface + 49.winbind + 50.samba + 60.nfs + " + + local s + for s in $scripts ; do + try_command_on_node all ctdb event script enable legacy "$s" + done +} + +######################################## + # Make sure that $CTDB is set. : ${CTDB:=ctdb} diff --git a/ctdb/tests/simple/00_ctdb_init.sh b/ctdb/tests/simple/00_ctdb_init.sh index 66b42ddc561..26b2615a0bf 100755 --- a/ctdb/tests/simple/00_ctdb_init.sh +++ b/ctdb/tests/simple/00_ctdb_init.sh @@ -30,6 +30,10 @@ set -e ctdb_stop_all >/dev/null 2>&1 || true +if [ -z "$TEST_LOCAL_DAEMONS" ] ; then + ctdb_enable_cluster_test_event_scripts +fi + setup_ctdb ctdb_start_all -- 2.34.1