From: Martin Schwenke <martin@meltin.net>
Date: Wed, 21 Mar 2018 20:19:14 +0000 (+1100)
Subject: ctdb-tests: Use setup_script_options() in 41.httpd tests
X-Git-Tag: talloc-2.1.13~136
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=3944fc4ae304c8e58c8fa0f7c3b98c5d8bd29845;p=thirdparty%2Fsamba.git

ctdb-tests: Use setup_script_options() in 41.httpd tests

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

diff --git a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh b/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
index 6266b143189..c2238a5820e 100755
--- a/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.monitor.002.sh
@@ -6,7 +6,9 @@ define_test "managed, down - 5 times"
 
 setup "down"
 
+setup_script_options <<EOF
 CTDB_MANAGES_HTTPD="yes"
+EOF
 
 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 726254cf771..79a33a45859 100755
--- a/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.shutdown.002.sh
@@ -6,7 +6,9 @@ define_test "managed"
 
 setup "up"
 
+setup_script_options <<EOF
 CTDB_MANAGES_HTTPD="yes"
+EOF
 
 ok <<EOF
 Stopping httpd: OK
diff --git a/ctdb/tests/eventscripts/41.httpd.startup.002.sh b/ctdb/tests/eventscripts/41.httpd.startup.002.sh
index e83ca0d3433..0e5c0cf3f1f 100755
--- a/ctdb/tests/eventscripts/41.httpd.startup.002.sh
+++ b/ctdb/tests/eventscripts/41.httpd.startup.002.sh
@@ -6,7 +6,9 @@ define_test "managed"
 
 setup "down"
 
+setup_script_options <<EOF
 CTDB_MANAGES_HTTPD="yes"
+EOF
 
 ok <<EOF
 Starting httpd: OK
diff --git a/ctdb/tests/eventscripts/scripts/41.httpd.sh b/ctdb/tests/eventscripts/scripts/41.httpd.sh
index 7af8a88e9c0..4061d0f6061 100644
--- a/ctdb/tests/eventscripts/scripts/41.httpd.sh
+++ b/ctdb/tests/eventscripts/scripts/41.httpd.sh
@@ -12,5 +12,7 @@ setup ()
 		done
 	fi
 
-	export CTDB_MANAGES_HTTPD=""
+	setup_script_options <<EOF
+CTDB_MANAGES_HTTPD=""
+EOF
 }