ctdb-tests: Use setup_script_options() in 10.interface tests

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

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.009.sh b/ctdb/tests/eventscripts/10.interface.monitor.009.sh
index e68fb4d41443cf9fb8a7bd28ef4114414ca1300c..93ed68baf4cf77dcb8780448d2b3d827a269feb4 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.009.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.009.sh
@@ -8,7 +8,9 @@ setup
 
 iface=$(ctdb_get_1_interface)
 
+setup_script_options <<EOF
 CTDB_PARTIALLY_ONLINE_INTERFACES=yes
+EOF
 
 ethtool_interfaces_down "$iface"
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.010.sh b/ctdb/tests/eventscripts/10.interface.monitor.010.sh
index a59b96849cdbb81ad3a40ae8b358a188a3a71700..528789372e66c821a286b33edce5bc11d9a87f64 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.010.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.010.sh
@@ -8,7 +8,9 @@ setup
 
 ifaces=$(ctdb_get_interfaces)
 
+setup_script_options <<EOF
 CTDB_PARTIALLY_ONLINE_INTERFACES=yes
+EOF
 
 ethtool_interfaces_down $ifaces
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.011.sh b/ctdb/tests/eventscripts/10.interface.monitor.011.sh
index 81e11fb142c7dd06a8dc4d0df768eb8e637b3554..824bd32b062c032622377281c4279535e3869ebb 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.011.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.011.sh
@@ -10,7 +10,9 @@ iface=$(ctdb_get_1_interface)
 
 setup_bond $iface "None"
 
+setup_script_options <<EOF
 CTDB_PARTIALLY_ONLINE_INTERFACES=yes
+EOF
 
 ethtool_interfaces_down "$iface"
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.012.sh b/ctdb/tests/eventscripts/10.interface.monitor.012.sh
index 0d4e580d4eeee48ff6727458c9c3ce303aadd39a..131598030d590dd07253e8de23ae1965f32a4fe3 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.012.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.012.sh
@@ -12,7 +12,9 @@ for i in $ifaces ; do
     setup_bond $i "None"
 done
 
+setup_script_options <<EOF
 CTDB_PARTIALLY_ONLINE_INTERFACES=yes
+EOF
 
 ethtool_interfaces_down $ifaces
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.016.sh b/ctdb/tests/eventscripts/10.interface.monitor.016.sh
index d8b233061b9381f01c56edd876f526be9a19c0d4..bd7f3022ca483a92ee4a1daab58c3d7fad467b5f 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.016.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.016.sh
@@ -6,7 +6,9 @@ define_test "Missing interface, CTDB_PARTIALLY_ONLINE_INTERFACES=yes, warn"
 
 setup
 
+setup_script_options <<EOF
 CTDB_PARTIALLY_ONLINE_INTERFACES=yes
+EOF
 
 iface=$(ctdb_get_1_interface)
 ip link delete "$iface"

diff --git a/ctdb/tests/eventscripts/scripts/10.interface.sh b/ctdb/tests/eventscripts/scripts/10.interface.sh
index 0393e012ca5671c90b7bf9862bf3792ec2edcf15..b2bc87ed558d6c402b6a8a8d117fef06fbdc7941 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/10.interface.sh
+++ b/ctdb/tests/eventscripts/scripts/10.interface.sh
@@ -1,8 +1,6 @@
 setup ()
 {
        setup_public_addresses
-
-       export CTDB_PARTIALLY_ONLINE_INTERFACES=""
 }
 
 _tcp_connections ()