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 538eae787e8004d6a4ab188da403a172a1f4a8ca..8bf0fa29e7ae9d68ef98a207da886dbe6a748f7a 100755 (executable)
--- 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 884ca81a0b1da93c53518977f467ee5555113ecf..7eb7c33603b96cec48879d63a287a0821ea99fef 100755 (executable)
--- 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 538eae787e8004d6a4ab188da403a172a1f4a8ca..8bf0fa29e7ae9d68ef98a207da886dbe6a748f7a 100755 (executable)
--- 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 895bf2d2ce2b69299efeb93db420fb8005b47bf7..5c9c5eee437ce129d27a72fcf64fe4d6ae27bcb9 100755 (executable)
--- 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 538eae787e8004d6a4ab188da403a172a1f4a8ca..8bf0fa29e7ae9d68ef98a207da886dbe6a748f7a 100755 (executable)
--- 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 5ec9a0765d59f6953241959eb71213fca18b26d9..eb139edbad8aa31cbcedc3192f4247e3aab56257 100755 (executable)
--- 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 2197ade6f9faa2899f381418d76f2ea67a60b89a..d0cf43c3b651c9f09b05cc6c69ae6b01dcb623aa 100755 (executable)
--- 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 51ce93e5267f2ce0443b5cacafef8041b4fbeaf1..9e3438f2e9ab01b856bf5169d7e77864a394ebb6 100755 (executable)
--- 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 538eae787e8004d6a4ab188da403a172a1f4a8ca..8bf0fa29e7ae9d68ef98a207da886dbe6a748f7a 100755 (executable)
--- 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 752070c24526740d5d1d8afd03895af01034f66f..7f0d6b115ec68430df796b7457dedb5c0b7cff69 100755 (executable)
--- 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 538eae787e8004d6a4ab188da403a172a1f4a8ca..8bf0fa29e7ae9d68ef98a207da886dbe6a748f7a 100755 (executable)
--- 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 9ddf9d878251f514270ebe2bf49e5bd9fdecb1f4..11312d6d1ab4607769c14909144e02778b46953e 100755 (executable)
--- 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 538eae787e8004d6a4ab188da403a172a1f4a8ca..8bf0fa29e7ae9d68ef98a207da886dbe6a748f7a 100755 (executable)
--- 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 d431ea425b95f9532660f531fdd6860307b81ea5..ccea98e4bd7f99d0fdfec42de6757ba0c1e5aea1 100755 (executable)
--- 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 538eae787e8004d6a4ab188da403a172a1f4a8ca..8bf0fa29e7ae9d68ef98a207da886dbe6a748f7a 100755 (executable)
--- 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 5f4f19762c97f6f1bf6bef47682426b9606ee1de..4d887b77cbbaa571823e56e99bfd4f64526ec091 100755 (executable)
--- 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 efc5810218aee8c005419bab1769db554879ea9d..a23d301af66c6ed60b667603ffe09edee8ba841f 100644 (file)
--- 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