diff mbox series

[F/J/K,OEM-5.17/OEM-6.0,SRU,1/1] selftest: fib_tests: Always cleanup before exit

Message ID 20230412050647.366719-2-po-hsu.lin@canonical.com
State New
Headers show
Series selftest: fib_tests: Always cleanup before exit | expand

Commit Message

Po-Hsu Lin April 12, 2023, 5:06 a.m. UTC 
From: Roxana Nicolescu <roxana.nicolescu@canonical.com>

BugLink: https://bugs.launchpad.net/bugs/2015956

Usage of `set -e` before executing a command causes immediate exit
on failure, without cleanup up the resources allocated at setup.
This can affect the next tests that use the same resources,
leading to a chain of failures.

A simple fix is to always call cleanup function when the script exists.
This approach is already used by other existing tests.

Fixes: 1056691b2680 ("selftests: fib_tests: Make test results more verbose")
Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
Link: https://lore.kernel.org/r/20230220110400.26737-2-roxana.nicolescu@canonical.com
Signed-off-by: Paolo Abeni <pabeni@redhat.com>
(cherry picked from commit b60417a9f2b890a8094477b2204d4f73c535725e)
Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
---
 tools/testing/selftests/net/fib_tests.sh | 2 ++
 1 file changed, 2 insertions(+)

Comments

Roxana Nicolescu April 12, 2023, 7:11 a.m. UTC | #1 
On 12/04/2023 07:06, Po-Hsu Lin wrote:
> From: Roxana Nicolescu <roxana.nicolescu@canonical.com>
>
> BugLink: https://bugs.launchpad.net/bugs/2015956
>
> Usage of `set -e` before executing a command causes immediate exit
> on failure, without cleanup up the resources allocated at setup.
> This can affect the next tests that use the same resources,
> leading to a chain of failures.
>
> A simple fix is to always call cleanup function when the script exists.
> This approach is already used by other existing tests.
>
> Fixes: 1056691b2680 ("selftests: fib_tests: Make test results more verbose")
> Signed-off-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
> Link: https://lore.kernel.org/r/20230220110400.26737-2-roxana.nicolescu@canonical.com
> Signed-off-by: Paolo Abeni <pabeni@redhat.com>
> (cherry picked from commit b60417a9f2b890a8094477b2204d4f73c535725e)
> Signed-off-by: Po-Hsu Lin <po-hsu.lin@canonical.com>
> ---
>   tools/testing/selftests/net/fib_tests.sh | 2 ++
>   1 file changed, 2 insertions(+)
>
> diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh
> index 5637b5da..70ea879 100755
> --- a/tools/testing/selftests/net/fib_tests.sh
> +++ b/tools/testing/selftests/net/fib_tests.sh
> @@ -2065,6 +2065,8 @@ EOF
>   ################################################################################
>   # main
>   
> +trap cleanup EXIT
> +
>   while getopts :t:pPhv o
>   do
>   	case $o in

Thanks for picking this up.

Acked-by: Roxana Nicolescu <roxana.nicolescu@canonical.com>
diff mbox series

Patch

diff --git a/tools/testing/selftests/net/fib_tests.sh b/tools/testing/selftests/net/fib_tests.sh
index 5637b5da..70ea879 100755
--- a/tools/testing/selftests/net/fib_tests.sh
+++ b/tools/testing/selftests/net/fib_tests.sh
@@ -2065,6 +2065,8 @@  EOF
 ################################################################################
 # main
 
+trap cleanup EXIT
+
 while getopts :t:pPhv o
 do
 	case $o in