From f33f4b3a2317f0d3c48b9b36c9af4af2ca219a10 Mon Sep 17 00:00:00 2001 From: Martin Schwenke Date: Mon, 19 Mar 2018 20:43:15 +1100 Subject: [PATCH] ctdb-tests: Create 41.httpd.sh Contains testing support used only by tests for 41.httpd event script. Signed-off-by: Martin Schwenke Reviewed-by: Amitay Isaacs --- ctdb/tests/eventscripts/scripts/41.httpd.sh | 16 ++++++++++++++++ ctdb/tests/eventscripts/scripts/local.sh | 21 --------------------- 2 files changed, 16 insertions(+), 21 deletions(-) create mode 100644 ctdb/tests/eventscripts/scripts/41.httpd.sh diff --git a/ctdb/tests/eventscripts/scripts/41.httpd.sh b/ctdb/tests/eventscripts/scripts/41.httpd.sh new file mode 100644 index 000000000000..89ff6d1aa735 --- /dev/null +++ b/ctdb/tests/eventscripts/scripts/41.httpd.sh @@ -0,0 +1,16 @@ +setup_httpd () +{ + debug "Setting up HTTPD environment: service $1, not managed by CTDB" + + if [ "$1" != "down" ] ; then + for _service_name in "apache2" "httpd" ; do + service "$_service_name" start + done + else + for _service_name in "apache2" "httpd" ; do + service "$_service_name" force-stopped + done + fi + + export CTDB_MANAGES_HTTPD="" +} diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh index 04c34773008e..787b4940d4de 100644 --- a/ctdb/tests/eventscripts/scripts/local.sh +++ b/ctdb/tests/eventscripts/scripts/local.sh @@ -896,27 +896,6 @@ program $_rpc_service${_ver:+ version }${_ver} is not available" ###################################################################### -# HTTPD fakery - -setup_httpd () -{ - debug "Setting up HTTPD environment: service $1, not managed by CTDB" - - if [ "$1" != "down" ] ; then - for _service_name in "apache2" "httpd" ; do - service "$_service_name" start - done - else - for _service_name in "apache2" "httpd" ; do - service "$_service_name" force-stopped - done - fi - - export CTDB_MANAGES_HTTPD="" -} - -###################################################################### - # Result and test functions # Set some globals and print the summary. -- 2.34.1