ctdb-tests: 41.httpd event script setup modularisation

Signed-off-by: Martin Schwenke <martin@meltin.net>
Reviewed-by: Amitay Isaacs <amitay@gmail.com>

diff --git a/ctdb/tests/eventscripts/41.httpd.monitor.001.sh b/ctdb/tests/eventscripts/41.httpd.monitor.001.sh
index f400eaa89b4e8a023aa05e4726db2ca59c4a95c9..00f8180901f98a972c5f8aa28fa3a813549fc1fa 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.monitor.001.sh
+++ b/ctdb/tests/eventscripts/41.httpd.monitor.001.sh
@@ -4,7 +4,7 @@
 
 define_test "not managed, check no-op"
 
-setup_httpd "down"
+setup "down"
 
 ok_null
 

diff --git a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh b/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
index 328ac41e53c3ad91a56031a6e7d47ed170ea6695..6266b143189bb4f44122c3afbc8066ba5a8b62c3 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
@@ -4,8 +4,9 @@
 
 define_test "managed, down - 5 times"
 
-setup_httpd "down"
-export CTDB_MANAGES_HTTPD="yes"
+setup "down"
+
+CTDB_MANAGES_HTTPD="yes"
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/41.httpd.shutdown.001.sh b/ctdb/tests/eventscripts/41.httpd.shutdown.001.sh
index 92bd27e23a2a8d8b93926dec2467b475fe1e881b..328e1e49cbf0f2df9ba068ed736a5caaeacfd8d6 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.shutdown.001.sh
+++ b/ctdb/tests/eventscripts/41.httpd.shutdown.001.sh
@@ -4,7 +4,7 @@
 
 define_test "not managed"
 
-setup_httpd "down"
+setup "down"
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh b/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
index e57fb8e587ec4b1b6137e86c1c5aef1ce83bcaf9..726254cf771fae04b04d1e9dcedecb7d5a389d26 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
@@ -4,8 +4,9 @@
 
 define_test "managed"
 
-setup_httpd "up"
-export CTDB_MANAGES_HTTPD="yes"
+setup "up"
+
+CTDB_MANAGES_HTTPD="yes"
 
 ok <<EOF
 Stopping httpd: OK

diff --git a/ctdb/tests/eventscripts/41.httpd.startup.001.sh b/ctdb/tests/eventscripts/41.httpd.startup.001.sh
index 92bd27e23a2a8d8b93926dec2467b475fe1e881b..328e1e49cbf0f2df9ba068ed736a5caaeacfd8d6 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.startup.001.sh
+++ b/ctdb/tests/eventscripts/41.httpd.startup.001.sh
@@ -4,7 +4,7 @@
 
 define_test "not managed"
 
-setup_httpd "down"
+setup "down"
 
 ok_null
 simple_test

diff --git a/ctdb/tests/eventscripts/41.httpd.startup.002.sh b/ctdb/tests/eventscripts/41.httpd.startup.002.sh
index 494f1cbd87fcc3d0ff312ac07e9642d6f9813f99..e83ca0d3433ba2c1b7ead8637e781cc39da6d033 100755 (executable)
--- a/ctdb/tests/eventscripts/41.httpd.startup.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.startup.002.sh
@@ -4,8 +4,9 @@
 
 define_test "managed"
 
-setup_httpd "down"
-export CTDB_MANAGES_HTTPD="yes"
+setup "down"
+
+CTDB_MANAGES_HTTPD="yes"
 
 ok <<EOF
 Starting httpd: OK

diff --git a/ctdb/tests/eventscripts/scripts/41.httpd.sh b/ctdb/tests/eventscripts/scripts/41.httpd.sh
index 89ff6d1aa7354bd736862e320d8afdded766402c..7af8a88e9c0363b1d5a74cddeab3d41be167fec1 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/41.httpd.sh
+++ b/ctdb/tests/eventscripts/scripts/41.httpd.sh
@@ -1,4 +1,4 @@
-setup_httpd ()
+setup ()
 {
        debug "Setting up HTTPD environment: service $1, not managed by CTDB"