From: Martin Schwenke <martin@meltin.net>
Date: Wed, 21 Mar 2018 11:21:46 +0000 (+1100)
Subject: ctdb-tests: Use setup_script_options() in 10.interface tests
X-Git-Tag: talloc-2.1.13~142
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=87cd76e0c62052fa0d28dfea3a5fc1088d5d883d;p=thirdparty%2Fsamba.git

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 e68fb4d4144..93ed68baf4c 100755
--- 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 a59b96849cd..528789372e6 100755
--- 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 81e11fb142c..824bd32b062 100755
--- 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 0d4e580d4ee..131598030d5 100755
--- 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 d8b233061b9..bd7f3022ca4 100755
--- 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 0393e012ca5..b2bc87ed558 100644
--- 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 ()