diff options
| author | Martin Schwenke <martin@meltin.net> | 2011-07-05 17:12:21 +1000 |
|---|---|---|
| committer | Martin Schwenke <martin@meltin.net> | 2011-08-08 13:47:13 +1000 |
| commit | 2c9c77f6dcf27ef400973174787eaceee8f4b6d6 (patch) | |
| tree | 452cc49fd6242b72a9d0a3e0d9d03205df80dea3 | |
| parent | 506be3cb26dd3414e48e1b10b2b3f801ed272fc3 (diff) | |
| download | samba-2c9c77f6dcf27ef400973174787eaceee8f4b6d6.tar.gz samba-2c9c77f6dcf27ef400973174787eaceee8f4b6d6.tar.xz samba-2c9c77f6dcf27ef400973174787eaceee8f4b6d6.zip | |
Tests: update tests to work with previous commit.
Issues:
* 10.monitor no longer prints a message when there is no
public_addresses file.
* Extra bonding test added to check workaround for IEEE 802.3ad
Dynamic link aggregation bonding mode bug.
Signed-off-by: Martin Schwenke <martin@meltin.net>
(This used to be ctdb commit 01c941ab4c764c5aac0d7c0f90fca89775956d41)
5 files changed, 25 insertions, 3 deletions
diff --git a/ctdb/tests/eventscripts/common.sh b/ctdb/tests/eventscripts/common.sh index 3e9076e79a..ab7abb9fac 100644 --- a/ctdb/tests/eventscripts/common.sh +++ b/ctdb/tests/eventscripts/common.sh @@ -147,10 +147,17 @@ setup_bond () _iface="$1" _slave="${2:-${_iface}_sl_0}" _mii_s="${3:-up}" + _mii_subs="${4:-${_mii_s:-up}}" echo "Setting $_iface to be a bond with active slave $_slave and MII status $_mii_s" cat >"${FAKE_PROC_NET_BONDING}/$_iface" <<EOF +Bonding Mode: IEEE 802.3ad Dynamic link aggregation Currently Active Slave: $_slave +# Status of the bond MII Status: $_mii_s +# Status of 1st pretend adapter +MII Status: $_mii_subs +# Status of 2nd pretend adapter +MII Status: $_mii_subs EOF } diff --git a/ctdb/tests/eventscripts/simple/10.interface.init.001.sh b/ctdb/tests/eventscripts/simple/10.interface.init.001.sh index 5a61ab3efd..411355f105 100755 --- a/ctdb/tests/eventscripts/simple/10.interface.init.001.sh +++ b/ctdb/tests/eventscripts/simple/10.interface.init.001.sh @@ -8,6 +8,6 @@ setup_ctdb export CTDB_PUBLIC_ADDRESSES="$CTDB_ETC/does/not/exist" -ok "No public addresses file found. Nothing to do for 10.interfaces" +ok_null simple_test diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.001.sh b/ctdb/tests/eventscripts/simple/10.interface.monitor.001.sh index 5a61ab3efd..411355f105 100755 --- a/ctdb/tests/eventscripts/simple/10.interface.monitor.001.sh +++ b/ctdb/tests/eventscripts/simple/10.interface.monitor.001.sh @@ -8,6 +8,6 @@ setup_ctdb export CTDB_PUBLIC_ADDRESSES="$CTDB_ETC/does/not/exist" -ok "No public addresses file found. Nothing to do for 10.interfaces" +ok_null simple_test diff --git a/ctdb/tests/eventscripts/simple/10.interface.monitor.013.sh b/ctdb/tests/eventscripts/simple/10.interface.monitor.013.sh new file mode 100755 index 0000000000..88e884dc84 --- /dev/null +++ b/ctdb/tests/eventscripts/simple/10.interface.monitor.013.sh @@ -0,0 +1,15 @@ +#!/bin/sh + +. "${EVENTSCRIPTS_TESTS_DIR}/common.sh" + +define_test "1 bond, active slaves, link down" + +setup_ctdb + +iface=$(ctdb_get_1_interface) + +setup_bond $iface "" "up" "down" + +required_result 1 "ERROR: No active slaves for 802.ad bond device $iface" + +simple_test diff --git a/ctdb/tests/eventscripts/simple/10.interface.startup.001.sh b/ctdb/tests/eventscripts/simple/10.interface.startup.001.sh index 5a61ab3efd..411355f105 100755 --- a/ctdb/tests/eventscripts/simple/10.interface.startup.001.sh +++ b/ctdb/tests/eventscripts/simple/10.interface.startup.001.sh @@ -8,6 +8,6 @@ setup_ctdb export CTDB_PUBLIC_ADDRESSES="$CTDB_ETC/does/not/exist" -ok "No public addresses file found. Nothing to do for 10.interfaces" +ok_null simple_test |