ctdb-tests: 10.interface event script setup modularisation

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

diff --git a/ctdb/tests/eventscripts/10.interface.010.sh b/ctdb/tests/eventscripts/10.interface.010.sh
index f5fa0622582a0a6c68b161bb9c0d61c70e6127ae..171a6973ea0029b1a7ff12e3aa317798711cdf85 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.010.sh
+++ b/ctdb/tests/eventscripts/10.interface.010.sh
@@ -4,7 +4,7 @@
 
 define_test "Release 1 IP, 10 connections killed OK"
 
-setup_ctdb
+setup
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do

diff --git a/ctdb/tests/eventscripts/10.interface.011.sh b/ctdb/tests/eventscripts/10.interface.011.sh
index 1b85cead0c30435b401083f7a889fd3cb9360d40..fa8002d5100a13ceb2767ac124b8d24e9caae5e2 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.011.sh
+++ b/ctdb/tests/eventscripts/10.interface.011.sh
@@ -4,7 +4,7 @@
 
 define_test "Release 1 IP, 10 connections killed, 1 fails"
 
-setup_ctdb
+setup
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do

diff --git a/ctdb/tests/eventscripts/10.interface.012.sh b/ctdb/tests/eventscripts/10.interface.012.sh
index 03c6c792504d493561a43447c4038890485c004a..394b718af8567ed694473938c037ed2e527749e7 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.012.sh
+++ b/ctdb/tests/eventscripts/10.interface.012.sh
@@ -4,7 +4,7 @@
 
 define_test "Release 1 IP, 10 connections killed, 3 fail"
 
-setup_ctdb
+setup
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do

diff --git a/ctdb/tests/eventscripts/10.interface.013.sh b/ctdb/tests/eventscripts/10.interface.013.sh
index eb4c2803ba09950f700d4a7817b3365a5c8bfc27..64f365e127564aacc614d4638ac145229541f597 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.013.sh
+++ b/ctdb/tests/eventscripts/10.interface.013.sh
@@ -4,7 +4,7 @@
 
 define_test "Release 1 IP, all 10 connections kills fail"
 
-setup_ctdb
+setup
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do

diff --git a/ctdb/tests/eventscripts/10.interface.init.001.sh b/ctdb/tests/eventscripts/10.interface.init.001.sh
index 65c6bdc2a9aad6ef0c64ada7259c6863c3060c0e..7f370b2d3db73f332e25bdb4770eedf5d73e84fd 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.init.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.001.sh
@@ -4,7 +4,7 @@
 
 define_test "no public addresses"
 
-setup_ctdb
+setup
 
 rm -f "${CTDB_BASE}/public_addresses"
 

diff --git a/ctdb/tests/eventscripts/10.interface.init.002.sh b/ctdb/tests/eventscripts/10.interface.init.002.sh
index ba33f927c3f8d494ac7fb919ac39244d01095f53..1862eac49d003b4bde6a200455f204925696a2db 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.init.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.002.sh
@@ -4,7 +4,7 @@
 
 define_test "all interfaces up"
 
-setup_ctdb
+setup
 
 ok_null
 

diff --git a/ctdb/tests/eventscripts/10.interface.init.021.sh b/ctdb/tests/eventscripts/10.interface.init.021.sh
index 87dfa4dfdcf6a0b52b1dc3a20c5e4ee81783f337..fd89c87670f222bd18ba399a0620a30cf59a21af 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.init.021.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.021.sh
@@ -4,7 +4,7 @@
 
 define_test "Check public IP dropping, none assigned"
 
-setup_ctdb
+setup
 
 ok_null
 

diff --git a/ctdb/tests/eventscripts/10.interface.init.022.sh b/ctdb/tests/eventscripts/10.interface.init.022.sh
index 6e594280a3a7aedab28aebbbaf073968da832715..ee7fa148ff4c973d773269e21e2080c3eb41fabf 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.init.022.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.022.sh
@@ -4,7 +4,7 @@
 
 define_test "Check public IP dropping, 1 assigned"
 
-setup_ctdb
+setup
 
 ctdb_get_1_public_address |
 while read dev ip bits ; do

diff --git a/ctdb/tests/eventscripts/10.interface.init.023.sh b/ctdb/tests/eventscripts/10.interface.init.023.sh
index 9b97e8213138251f427734c20e28c7df91e7f7de..b39b67aead95568ef438380d1b3bdca7bf76cb5a 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.init.023.sh
+++ b/ctdb/tests/eventscripts/10.interface.init.023.sh
@@ -4,7 +4,7 @@
 
 define_test "Check public IP dropping, all assigned"
 
-setup_ctdb
+setup
 
 nl="
 "

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.001.sh b/ctdb/tests/eventscripts/10.interface.monitor.001.sh
index 9f2939acee9a778603623c7ea9649940f16a1b9b..c829efc87eec38fd5346048e831159259eb8d234 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.001.sh
@@ -4,7 +4,7 @@
 
 define_test "no public addresses"
 
-setup_ctdb
+setup
 
 rm -f "${CTDB_BASE}/public_addresses"
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.002.sh b/ctdb/tests/eventscripts/10.interface.monitor.002.sh
index ba33f927c3f8d494ac7fb919ac39244d01095f53..1862eac49d003b4bde6a200455f204925696a2db 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.002.sh
@@ -4,7 +4,7 @@
 
 define_test "all interfaces up"
 
-setup_ctdb
+setup
 
 ok_null
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.003.sh b/ctdb/tests/eventscripts/10.interface.monitor.003.sh
index 1eb7916b932f5e2934e50c2927592ebf2800f5dd..db1b2c642843afa5390a0b6f41c72f0f80900d7e 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.003.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.003.sh
@@ -4,7 +4,7 @@
 
 define_test "1 interface down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.004.sh b/ctdb/tests/eventscripts/10.interface.monitor.004.sh
index 69ffbd00cd5b320356791b62c7337b79e776d5e7..3f20fdc6b8e6501f3f503e540111918d081c3ec5 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.004.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.004.sh
@@ -4,7 +4,7 @@
 
 define_test "all interfaces up, 1 is a bond"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.005.sh b/ctdb/tests/eventscripts/10.interface.monitor.005.sh
index 8cf7bbc9c0a0eb47749aa7cf8a4b42d310d52905..1042d1566deaf5cb04c7b2a4e9997d166cb79cc3 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.005.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.005.sh
@@ -4,7 +4,7 @@
 
 define_test "1 bond, no active slaves"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.006.sh b/ctdb/tests/eventscripts/10.interface.monitor.006.sh
index 3c483a3516f3e937c4740ce5223050d263516cf2..5facf0850ec20f4a4f0a007f73c663931551cef9 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.006.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.006.sh
@@ -4,7 +4,7 @@
 
 define_test "1 bond, active slaves, link down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.009.sh b/ctdb/tests/eventscripts/10.interface.monitor.009.sh
index 1b785ffdc80f2ba3b6340f31f7cf4e43fc86bb3f..e68fb4d41443cf9fb8a7bd28ef4114414ca1300c 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.009.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.009.sh
@@ -4,11 +4,11 @@
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
-export CTDB_PARTIALLY_ONLINE_INTERFACES="yes"
+CTDB_PARTIALLY_ONLINE_INTERFACES=yes
 
 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 4d233193fb6fce103ae4c21f96082caf2cfa0fb4..a59b96849cdbb81ad3a40ae8b358a188a3a71700 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.010.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.010.sh
@@ -4,15 +4,19 @@
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, all down"
 
-setup_ctdb
+setup
 
 ifaces=$(ctdb_get_interfaces)
 
-export CTDB_PARTIALLY_ONLINE_INTERFACES="yes"
+CTDB_PARTIALLY_ONLINE_INTERFACES=yes
 
 ethtool_interfaces_down $ifaces
 
-msg=$(for i in $ifaces ; do echo "ERROR: No link on the public network interface $i" ; done)
+msg=$(
+       for i in $ifaces ; do
+               echo "ERROR: No link on the public network interface $i"
+       done
+   )
 
 required_result 1 "$msg"
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.011.sh b/ctdb/tests/eventscripts/10.interface.monitor.011.sh
index 21775d41ce5354aef56d8272f0d219ed166a0f82..81e11fb142c7dd06a8dc4d0df768eb8e637b3554 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.011.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.011.sh
@@ -4,13 +4,13 @@
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 bond down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 
 setup_bond $iface "None"
 
-export CTDB_PARTIALLY_ONLINE_INTERFACES="yes"
+CTDB_PARTIALLY_ONLINE_INTERFACES=yes
 
 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 dbe84b7729669906cd5d6ee43c9c4dbd36f6b333..0d4e580d4eeee48ff6727458c9c3ce303aadd39a 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.012.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.012.sh
@@ -4,7 +4,7 @@
 
 define_test "CTDB_PARTIALLY_ONLINE_INTERFACES, 1 bond down"
 
-setup_ctdb
+setup
 
 ifaces=$(ctdb_get_interfaces)
 
@@ -12,11 +12,15 @@ for i in $ifaces ; do
     setup_bond $i "None"
 done
 
-export CTDB_PARTIALLY_ONLINE_INTERFACES="yes"
+CTDB_PARTIALLY_ONLINE_INTERFACES=yes
 
 ethtool_interfaces_down $ifaces
 
-msg=$(for i in $ifaces ; do echo "ERROR: No active slaves for bond device $i" ; done)
+msg=$(
+       for i in $ifaces ; do
+               echo "ERROR: No active slaves for bond device $i"
+       done
+   )
 
 required_result 1 "$msg"
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.013.sh b/ctdb/tests/eventscripts/10.interface.monitor.013.sh
index 0fcdcd8d15bdabc7ea8ea4c08df7a185416932aa..2aa0a8e21b6c3f9d19e78d6ad750cdbd12f663f4 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.013.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.013.sh
@@ -4,7 +4,7 @@
 
 define_test "1 bond, active slaves, link down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.014.sh b/ctdb/tests/eventscripts/10.interface.monitor.014.sh
index ab23d307c29163c91ec270f2f6ddfa6060a36885..1dd8ff0976a4a0b02da833d5898057e5bd05898e 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.014.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.014.sh
@@ -4,7 +4,7 @@
 
 define_test "spurious addresses on interface, no action"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.015.sh b/ctdb/tests/eventscripts/10.interface.monitor.015.sh
index 01bd18457fa2fe923bf60209039c6ac93a4c6410..b7b4787eb1b312068463b7fedda505af1b170f1d 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.015.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.015.sh
@@ -4,7 +4,7 @@
 
 define_test "Missing interface, fail"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 ip link delete "$iface"

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

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.017.sh b/ctdb/tests/eventscripts/10.interface.monitor.017.sh
index 6e30040e2c7adaf1fc6d927ae37a22efd63dc480..bae0886b51dcf08497661965e6dbd32001237fe3 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.017.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.017.sh
@@ -4,7 +4,7 @@
 
 define_test "1 VLAN, link down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 

diff --git a/ctdb/tests/eventscripts/10.interface.monitor.018.sh b/ctdb/tests/eventscripts/10.interface.monitor.018.sh
index aac23b8812877db657918ec821366cd387a8ad95..8006d92c4fc9158847715a242fe660afadc86628 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.monitor.018.sh
+++ b/ctdb/tests/eventscripts/10.interface.monitor.018.sh
@@ -4,7 +4,7 @@
 
 define_test "VLAN on bond, active slaves, link down"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 

diff --git a/ctdb/tests/eventscripts/10.interface.multi.001.sh b/ctdb/tests/eventscripts/10.interface.multi.001.sh
index da8dcf188df8ae14ab9abd46cf4f60001c2d99ec..867cc2443dbfa26ce53007fb25943107e5bc1069 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.multi.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.multi.001.sh
@@ -4,7 +4,7 @@
 
 define_test "takeip, removeip"
 
-setup_ctdb
+setup
 
 public_address=$(ctdb_get_1_public_address)
 

diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.001.sh b/ctdb/tests/eventscripts/10.interface.releaseip.001.sh
index 934b3dc30ec07d91c1cf6a3fff697245f850b68c..2ac0b86f5edde0e477a69f97e824e40ba758387a 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.releaseip.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.releaseip.001.sh
@@ -4,7 +4,7 @@
 
 define_test "error - no args given"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 

diff --git a/ctdb/tests/eventscripts/10.interface.releaseip.002.sh b/ctdb/tests/eventscripts/10.interface.releaseip.002.sh
index 4b9726cfdcc0a0c5b823d05fd317bd40a3528621..a60adbdbd7a0410663b03f04032ca3d18a896d42 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.releaseip.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.releaseip.002.sh
@@ -4,7 +4,7 @@
 
 define_test "error - remove a non-existent ip"
 
-setup_ctdb
+setup
 
 public_address=$(ctdb_get_1_public_address)
 ip="${public_address% *}" ; ip="${ip#* }"

diff --git a/ctdb/tests/eventscripts/10.interface.startup.001.sh b/ctdb/tests/eventscripts/10.interface.startup.001.sh
index 9f2939acee9a778603623c7ea9649940f16a1b9b..c829efc87eec38fd5346048e831159259eb8d234 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.startup.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.startup.001.sh
@@ -4,7 +4,7 @@
 
 define_test "no public addresses"
 
-setup_ctdb
+setup
 
 rm -f "${CTDB_BASE}/public_addresses"
 

diff --git a/ctdb/tests/eventscripts/10.interface.startup.002.sh b/ctdb/tests/eventscripts/10.interface.startup.002.sh
index ba33f927c3f8d494ac7fb919ac39244d01095f53..1862eac49d003b4bde6a200455f204925696a2db 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.startup.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.startup.002.sh
@@ -4,7 +4,7 @@
 
 define_test "all interfaces up"
 
-setup_ctdb
+setup
 
 ok_null
 

diff --git a/ctdb/tests/eventscripts/10.interface.takeip.001.sh b/ctdb/tests/eventscripts/10.interface.takeip.001.sh
index 934b3dc30ec07d91c1cf6a3fff697245f850b68c..2ac0b86f5edde0e477a69f97e824e40ba758387a 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.takeip.001.sh
+++ b/ctdb/tests/eventscripts/10.interface.takeip.001.sh
@@ -4,7 +4,7 @@
 
 define_test "error - no args given"
 
-setup_ctdb
+setup
 
 iface=$(ctdb_get_1_interface)
 

diff --git a/ctdb/tests/eventscripts/10.interface.takeip.002.sh b/ctdb/tests/eventscripts/10.interface.takeip.002.sh
index 8960b08997d6df5aee9b572b9f103ca2eed51eb3..e267f16739c392ef6cc40744adc3072d9a0cff86 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.takeip.002.sh
+++ b/ctdb/tests/eventscripts/10.interface.takeip.002.sh
@@ -4,7 +4,7 @@
 
 define_test "add an ip"
 
-setup_ctdb
+setup
 
 public_address=$(ctdb_get_1_public_address)
 

diff --git a/ctdb/tests/eventscripts/10.interface.takeip.003.sh b/ctdb/tests/eventscripts/10.interface.takeip.003.sh
index f6b205af5072fa72c5136ae4a461dccbcb525422..acb9b045f70f8eb7899916a6cc79f7e01b3e5d1f 100755 (executable)
--- a/ctdb/tests/eventscripts/10.interface.takeip.003.sh
+++ b/ctdb/tests/eventscripts/10.interface.takeip.003.sh
@@ -4,7 +4,7 @@
 
 define_test "error - add same IP twice"
 
-setup_ctdb
+setup
 
 public_address=$(ctdb_get_1_public_address)
 dev="${public_address%% *}"

diff --git a/ctdb/tests/eventscripts/scripts/10.interface.sh b/ctdb/tests/eventscripts/scripts/10.interface.sh
index df47602b27b28a6384dd0bb48640f966ee99e848..0393e012ca5671c90b7bf9862bf3792ec2edcf15 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/10.interface.sh
+++ b/ctdb/tests/eventscripts/scripts/10.interface.sh
@@ -1,3 +1,10 @@
+setup ()
+{
+       setup_public_addresses
+
+       export CTDB_PARTIALLY_ONLINE_INTERFACES=""
+}
+
 _tcp_connections ()
 {
        _count="$1"
@@ -19,7 +26,7 @@ _tcp_connections ()
 
 setup_tcp_connections ()
 {
-       _t=$(mktemp --tmpdir="$EVENTSCRIPTS_TESTS_VAR_DIR")
+       _t="${FAKE_NETWORK_STATE}/tcp-established"
        export FAKE_NETSTAT_TCP_ESTABLISHED_FILE="$_t"
        _tcp_connections "$@" >"$FAKE_NETSTAT_TCP_ESTABLISHED_FILE"
 }
@@ -49,6 +56,11 @@ setup_bond ()
        cat <<EOF
 Setting $_iface to be a bond with active slave $_slave and MII status $_mii_s
 EOF
+
+       _t="${FAKE_NETWORK_STATE}/proc-net-bonding"
+       export FAKE_PROC_NET_BONDING="$_t"
+       mkdir -p "$FAKE_PROC_NET_BONDING"
+
        cat >"${FAKE_PROC_NET_BONDING}/$_iface" <<EOF
 Bonding Mode: IEEE 802.3ad Dynamic link aggregation
 Currently Active Slave: $_slave

diff --git a/ctdb/tests/eventscripts/scripts/local.sh b/ctdb/tests/eventscripts/scripts/local.sh
index 78cdd6f3fc883eb4ffc870f0748f735b22a104d5..75f882515a083112fd13c98d11d470ac34ddf0f3 100644 (file)
--- a/ctdb/tests/eventscripts/scripts/local.sh
+++ b/ctdb/tests/eventscripts/scripts/local.sh
@@ -88,11 +88,6 @@ setup_date ()
 setup_generic ()
 {
     setup_shares
-
-    export FAKE_PROC_NET_BONDING="$EVENTSCRIPTS_TESTS_VAR_DIR/proc-net-bonding"
-    mkdir -p "$FAKE_PROC_NET_BONDING"
-    rm -f "$FAKE_PROC_NET_BONDING"/*
-
     setup_dbdir
     setup_date
 
@@ -286,8 +281,6 @@ setup_ctdb ()
     setup_generic
 
     setup_public_addresses
-
-    export CTDB_PARTIALLY_ONLINE_INTERFACES
 }
 
 validate_percentage ()