From: Martin Schwenke <martin@meltin.net>
Date: Thu, 22 Mar 2018 01:05:10 +0000 (+1100)
Subject: ctdb-tests: Use setup_script_options() in 60.nfs (and 06.nfs) tests
X-Git-Tag: talloc-2.1.13~133
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a48bd342465ff78275ed83824c01aefdddca2b77;p=thirdparty%2Fsamba.git

ctdb-tests: Use setup_script_options() in 60.nfs (and 06.nfs) tests

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

diff --git a/ctdb/tests/eventscripts/06.nfs.releaseip.001.sh b/ctdb/tests/eventscripts/06.nfs.releaseip.001.sh
index 538eae787e8..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/06.nfs.releaseip.001.sh
+++ b/ctdb/tests/eventscripts/06.nfs.releaseip.001.sh
@@ -6,7 +6,9 @@ define_test "callout is 'true'"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="true"
+EOF
 
 ok_null
 simple_test
diff --git a/ctdb/tests/eventscripts/06.nfs.releaseip.002.sh b/ctdb/tests/eventscripts/06.nfs.releaseip.002.sh
index 884ca81a0b1..7eb7c33603b 100755
--- a/ctdb/tests/eventscripts/06.nfs.releaseip.002.sh
+++ b/ctdb/tests/eventscripts/06.nfs.releaseip.002.sh
@@ -6,7 +6,9 @@ define_test "callout is 'false', causes releaseip-pre to fail"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="echo releaseip-pre ; false"
+EOF
 
 required_result 1 "releaseip-pre"
 simple_test
diff --git a/ctdb/tests/eventscripts/06.nfs.takeip.001.sh b/ctdb/tests/eventscripts/06.nfs.takeip.001.sh
index 538eae787e8..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/06.nfs.takeip.001.sh
+++ b/ctdb/tests/eventscripts/06.nfs.takeip.001.sh
@@ -6,7 +6,9 @@ define_test "callout is 'true'"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="true"
+EOF
 
 ok_null
 simple_test
diff --git a/ctdb/tests/eventscripts/06.nfs.takeip.002.sh b/ctdb/tests/eventscripts/06.nfs.takeip.002.sh
index 895bf2d2ce2..5c9c5eee437 100755
--- a/ctdb/tests/eventscripts/06.nfs.takeip.002.sh
+++ b/ctdb/tests/eventscripts/06.nfs.takeip.002.sh
@@ -6,7 +6,9 @@ define_test "callout is 'false', causes takeip-pre to fail"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="echo takeip-pre ; false"
+EOF
 
 required_result 1 "takeip-pre"
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.107.sh b/ctdb/tests/eventscripts/60.nfs.monitor.107.sh
index 538eae787e8..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.107.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.107.sh
@@ -6,7 +6,9 @@ define_test "callout is 'true'"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="true"
+EOF
 
 ok_null
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.108.sh b/ctdb/tests/eventscripts/60.nfs.monitor.108.sh
index 5ec9a0765d5..eb139edbad8 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.108.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.108.sh
@@ -6,7 +6,9 @@ define_test "callout is 'false', causes monitor-pre to fail"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="echo monitor-pre ; false"
+EOF
 
 required_result 1 "monitor-pre"
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.109.sh b/ctdb/tests/eventscripts/60.nfs.monitor.109.sh
index 2197ade6f9f..d0cf43c3b65 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.109.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.109.sh
@@ -6,7 +6,9 @@ define_test "callout is 'false', causes monitor-post to fail"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="echo monitor-post ; false"
+EOF
 
 required_result 1 "monitor-post"
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.monitor.162.sh b/ctdb/tests/eventscripts/60.nfs.monitor.162.sh
index 51ce93e5267..9e3438f2e9a 100755
--- a/ctdb/tests/eventscripts/60.nfs.monitor.162.sh
+++ b/ctdb/tests/eventscripts/60.nfs.monitor.162.sh
@@ -6,7 +6,9 @@ define_test "2nd share missing, skipping share checks"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_SKIP_SHARE_CHECK="yes"
+EOF
 
 ok_null
 
diff --git a/ctdb/tests/eventscripts/60.nfs.releaseip.001.sh b/ctdb/tests/eventscripts/60.nfs.releaseip.001.sh
index 538eae787e8..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/60.nfs.releaseip.001.sh
+++ b/ctdb/tests/eventscripts/60.nfs.releaseip.001.sh
@@ -6,7 +6,9 @@ define_test "callout is 'true'"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="true"
+EOF
 
 ok_null
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.releaseip.002.sh b/ctdb/tests/eventscripts/60.nfs.releaseip.002.sh
index 752070c2452..7f0d6b115ec 100755
--- a/ctdb/tests/eventscripts/60.nfs.releaseip.002.sh
+++ b/ctdb/tests/eventscripts/60.nfs.releaseip.002.sh
@@ -6,7 +6,9 @@ define_test "callout is 'false', causes releaseip to fail"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="echo releaseip ; false"
+EOF
 
 required_result 1 "releaseip"
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.shutdown.001.sh b/ctdb/tests/eventscripts/60.nfs.shutdown.001.sh
index 538eae787e8..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/60.nfs.shutdown.001.sh
+++ b/ctdb/tests/eventscripts/60.nfs.shutdown.001.sh
@@ -6,7 +6,9 @@ define_test "callout is 'true'"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="true"
+EOF
 
 ok_null
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.shutdown.002.sh b/ctdb/tests/eventscripts/60.nfs.shutdown.002.sh
index 9ddf9d87825..11312d6d1ab 100755
--- a/ctdb/tests/eventscripts/60.nfs.shutdown.002.sh
+++ b/ctdb/tests/eventscripts/60.nfs.shutdown.002.sh
@@ -6,7 +6,9 @@ define_test "callout is 'false', causes shutdown to fail"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="echo shutdown ; false"
+EOF
 
 required_result 1 "shutdown"
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.startup.001.sh b/ctdb/tests/eventscripts/60.nfs.startup.001.sh
index 538eae787e8..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/60.nfs.startup.001.sh
+++ b/ctdb/tests/eventscripts/60.nfs.startup.001.sh
@@ -6,7 +6,9 @@ define_test "callout is 'true'"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="true"
+EOF
 
 ok_null
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.startup.002.sh b/ctdb/tests/eventscripts/60.nfs.startup.002.sh
index d431ea425b9..ccea98e4bd7 100755
--- a/ctdb/tests/eventscripts/60.nfs.startup.002.sh
+++ b/ctdb/tests/eventscripts/60.nfs.startup.002.sh
@@ -6,7 +6,9 @@ define_test "callout is 'false', causes startup to fail"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="echo startup ; false"
+EOF
 
 required_result 1 "startup"
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.takeip.001.sh b/ctdb/tests/eventscripts/60.nfs.takeip.001.sh
index 538eae787e8..8bf0fa29e7a 100755
--- a/ctdb/tests/eventscripts/60.nfs.takeip.001.sh
+++ b/ctdb/tests/eventscripts/60.nfs.takeip.001.sh
@@ -6,7 +6,9 @@ define_test "callout is 'true'"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="true"
+EOF
 
 ok_null
 simple_test
diff --git a/ctdb/tests/eventscripts/60.nfs.takeip.002.sh b/ctdb/tests/eventscripts/60.nfs.takeip.002.sh
index 5f4f19762c9..4d887b77cbb 100755
--- a/ctdb/tests/eventscripts/60.nfs.takeip.002.sh
+++ b/ctdb/tests/eventscripts/60.nfs.takeip.002.sh
@@ -6,7 +6,9 @@ define_test "callout is 'false', causes takeip to fail"
 
 setup
 
+setup_script_options <<EOF
 CTDB_NFS_CALLOUT="echo takeip ; false"
+EOF
 
 required_result 1 "takeip"
 simple_test
diff --git a/ctdb/tests/eventscripts/scripts/60.nfs.sh b/ctdb/tests/eventscripts/scripts/60.nfs.sh
index efc5810218a..a23d301af66 100644
--- a/ctdb/tests/eventscripts/scripts/60.nfs.sh
+++ b/ctdb/tests/eventscripts/scripts/60.nfs.sh
@@ -6,13 +6,14 @@ setup ()
 
 	export FAKE_RPCINFO_SERVICES=""
 
-	export CTDB_NFS_SKIP_SHARE_CHECK="no"
+	setup_script_options <<EOF
+CTDB_NFS_SKIP_SHARE_CHECK="no"
+# This doesn't even need to exist
+CTDB_NFS_EXPORTS_FILE="$EVENTSCRIPTS_TESTS_VAR_DIR/etc-exports"
+EOF
 
 	export RPCNFSDCOUNT
 
-	# This doesn't even need to exist
-	export CTDB_NFS_EXPORTS_FILE="$EVENTSCRIPTS_TESTS_VAR_DIR/etc-exports"
-
 	if [ "$1" != "down" ] ; then
 		debug <<EOF
 Setting up NFS environment: all RPC services up, NFS managed by CTDB
@@ -21,7 +22,9 @@ EOF
 		service "nfs" force-started
 		service "nfslock" force-started
 
-		export CTDB_MANAGES_NFS="yes"
+		setup_script_options <<EOF
+CTDB_MANAGES_NFS="yes"
+EOF
 
 		rpc_services_up \
 			"portmapper" "nfs" "mountd" "rquotad" \
@@ -37,11 +40,11 @@ EOF
 		service "nfs" force-stopped
 		service "nfslock" force-stopped
 
-		export CTDB_MANAGES_NFS=""
+		setup_script_options <<EOF
+CTDB_MANAGES_NFS=""
+EOF
 	fi
 
-	export CTDB_NFS_CALLOUT=""
-
 	# This is really nasty.  However, when we test NFS we don't
 	# actually test statd-callout. If we leave it there then left
 	# over, backgrounded instances of statd-callout will do