Date: Thu, 4 Mar 2021 09:33:22 GMT From: Kristof Provost <kp@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org Subject: git: eb4221b9fb91 - stable/12 - bridge tests: Test that we also forward on some interfaces Message-ID: <202103040933.1249XMGE005929@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch stable/12 has been updated by kp: URL: https://cgit.FreeBSD.org/src/commit/?id=eb4221b9fb91980ea43dcf55e6610c6d044954e7 commit eb4221b9fb91980ea43dcf55e6610c6d044954e7 Author: Kristof Provost <kp@FreeBSD.org> AuthorDate: 2021-02-24 15:40:37 +0000 Commit: Kristof Provost <kp@FreeBSD.org> CommitDate: 2021-03-04 09:30:26 +0000 bridge tests: Test that we also forward on some interfaces Ensure that we not only block on some interfaces, but also forward on some. Without the previous commit we wound up discarding on all ports, rather than only on the ports needed to break the loop. MFC after: 1 week Sponsored by: Orange Business Services Differential Revision: https://reviews.freebsd.org/D28917 (cherry picked from commit 7a4dbffa4205fc274b4884a6332d4831c5791320) --- tests/sys/net/if_bridge_test.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/tests/sys/net/if_bridge_test.sh b/tests/sys/net/if_bridge_test.sh index bc9add68ce25..1f10fe325a2c 100755 --- a/tests/sys/net/if_bridge_test.sh +++ b/tests/sys/net/if_bridge_test.sh @@ -117,6 +117,15 @@ stp_body() then atf_fail "STP failed to detect bridging loop" fi + + # We must also have at least some forwarding interfaces + a_forwarding=$(jexec a ifconfig ${bridge_a} | grep forwarding) + b_forwarding=$(jexec b ifconfig ${bridge_b} | grep forwarding) + + if [ -z "${a_forwarding}" ] && [ -z "${b_forwarding}" ] + then + atf_fail "STP failed to detect bridging loop" + fi } stp_cleanup() @@ -182,6 +191,15 @@ stp_vlan_body() then atf_fail "STP failed to detect bridging loop" fi + + # We must also have at least some forwarding interfaces + a_forwarding=$(jexec a ifconfig ${bridge_a} | grep forwarding) + b_forwarding=$(jexec b ifconfig ${bridge_b} | grep forwarding) + + if [ -z "${a_forwarding}" ] && [ -z "${b_forwarding}" ] + then + atf_fail "STP failed to detect bridging loop" + fi } stp_vlan_cleanup()
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202103040933.1249XMGE005929>