Commit 18d2c710 authored by Petr Machata's avatar Petr Machata Committed by David S. Miller
Browse files

selftests: mlxsw: bail_on_lldpad before installing the cleanup trap



A number of mlxsw-specific QoS tests use manual QoS DCB management. As
such, they need to make sure lldpad is not running, because it would
override the configuration the test has applied using other tools. To that
end, these selftests invoke the bail_on_lldpad() helper, which terminates
the selftest if th lldpad is running.

Some of these tests however first install the bash exit trap, which invokes
a cleanup() at the test exit. If bail_on_lldpad() has terminated the script
even before the setup part was run, the cleanup part will be very confused.

Therefore make sure bail_on_lldpad() is invoked before the cleanup is
registered.

While there are still edge cases where the user terminates the script
before the setup was fully done, this takes care of a common situation
where the cleanup would be invoked in an inconsistent state.

Signed-off-by: default avatarPetr Machata <petrm@nvidia.com>
Signed-off-by: default avatarIdo Schimmel <idosch@nvidia.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 39e85fe0
Loading
Loading
Loading
Loading
+2 −2
Original line number Diff line number Diff line
@@ -371,9 +371,9 @@ test_tc_int_buf()
	tc qdisc delete dev $swp root
}

trap cleanup EXIT

bail_on_lldpad

trap cleanup EXIT
setup_wait
tests_run

+2 −2
Original line number Diff line number Diff line
@@ -393,9 +393,9 @@ test_qos_pfc()
	log_test "PFC"
}

trap cleanup EXIT

bail_on_lldpad

trap cleanup EXIT
setup_prepare
setup_wait
tests_run
+2 −3
Original line number Diff line number Diff line
@@ -166,12 +166,11 @@ ecn_mirror_test()
	uninstall_qdisc
}

trap cleanup EXIT
bail_on_lldpad

trap cleanup EXIT
setup_prepare
setup_wait

bail_on_lldpad
tests_run

exit $EXIT_STATUS
+2 −3
Original line number Diff line number Diff line
@@ -73,12 +73,11 @@ red_mirror_test()
	uninstall_qdisc
}

trap cleanup EXIT
bail_on_lldpad

trap cleanup EXIT
setup_prepare
setup_wait

bail_on_lldpad
tests_run

exit $EXIT_STATUS