[PATCH v2 3/7] kunit: Fix timeout message

[David Gow]

On Sat, 2 Mar 2024 at 03:40, Mickaël Salaün <mic at digikod.net> wrote:
>
> The exit code is always checked, so let's properly handle the -ETIMEDOUT
> error code.
>
> Cc: Brendan Higgins <brendanhiggins at google.com>
> Cc: David Gow <davidgow at google.com>
> Cc: Rae Moar <rmoar at google.com>
> Cc: Shuah Khan <skhan at linuxfoundation.org>
> Reviewed-by: Kees Cook <keescook at chromium.org>
> Signed-off-by: Mickaël Salaün <mic at digikod.net>
> Link: https://lore.kernel.org/r/20240301194037.532117-4-mic@digikod.net
> ---

This looks good to me. It might make sense to use a switch statement
rather than a change of else-ifs if we end up handling more errors in
the future, but this is fine for now.

Reviewed-by: David Gow <davidgow at google.com>

Cheers,
-- David


>
> Changes since v1:
> * Added Kees's Reviewed-by.
> ---
>  lib/kunit/try-catch.c | 3 ++-
>  1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/lib/kunit/try-catch.c b/lib/kunit/try-catch.c
> index 73f5007f20ea..cab8b24b5d5a 100644
> --- a/lib/kunit/try-catch.c
> +++ b/lib/kunit/try-catch.c
> @@ -79,7 +79,6 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context)
>         time_remaining = wait_for_completion_timeout(&try_completion,
>                                                      kunit_test_timeout());
>         if (time_remaining == 0) {
> -               kunit_err(test, "try timed out\n");
>                 try_catch->try_result = -ETIMEDOUT;
>                 kthread_stop(task_struct);
>         }
> @@ -94,6 +93,8 @@ void kunit_try_catch_run(struct kunit_try_catch *try_catch, void *context)
>                 try_catch->try_result = 0;
>         else if (exit_code == -EINTR)
>                 kunit_err(test, "wake_up_process() was never called\n");
> +       else if (exit_code == -ETIMEDOUT)
> +               kunit_err(test, "try timed out\n");
>         else if (exit_code)
>                 kunit_err(test, "Unknown error: %d\n", exit_code);
>
> --
> 2.44.0
>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: smime.p7s
Type: application/pkcs7-signature
Size: 4014 bytes
Desc: S/MIME Cryptographic Signature
URL: <http://lists.infradead.org/pipermail/linux-um/attachments/20240312/7e7bbe50/attachment.p7s>