From 12692c5285a3d72b77c4ea48e2582918dcdc2ddc Mon Sep 17 00:00:00 2001 From: Jian Yu Date: Mon, 29 Apr 2024 10:26:50 -0700 Subject: [PATCH] LU-17761 tests: make sanity-compr sanity/sanityn return 0 While running sanity-compr sanity/sanityn, if there was sub-subtest failure, the sanity/sanityn test_cleanup would be incorrectly marked as FAIL. We should leave it to the individual sanity/sanityn subtests to mark their failures, test_sanity() and test_sanityn() should not also return an error. Lustre-change: https://review.whamcloud.com/54855 Lustre-commit: TBD (from 96767ff8af44b5dac0677db759634515de1d1802) Test-Parameters: trivial testlist=sanity-compr Signed-off-by: Jian Yu Change-Id: I1fd645b80b92e583f1a564f85e6d2d6d871b8fa8 Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/54856 Reviewed-by: Artem Blagodarenko Reviewed-by: Sarah Liu Reviewed-by: Andreas Dilger Tested-by: jenkins Tested-by: Maloo --- lustre/tests/sanity-compr.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/lustre/tests/sanity-compr.sh b/lustre/tests/sanity-compr.sh index e530b1b..89052b7 100644 --- a/lustre/tests/sanity-compr.sh +++ b/lustre/tests/sanity-compr.sh @@ -156,25 +156,20 @@ test_sanity() always_except LU-16904 906 always_except EX-7938 100 always_except EX-8927 430c - local rc [[ -n "$SANITYN_ONLY" && -z "$SANITY_ONLY" ]] && return 0 SANITY_EXCEPT=$ALWAYS_EXCEPT ONLY=$SANITY_ONLY bash sanity.sh - rc=$? - return $rc + return 0 } run_test sanity "Run sanity with PFL layout" test_sanityn() { - local rc - [[ -n "$SANITY_ONLY" && -z "$SANITYN_ONLY" ]] && return 0 SANITYN_EXCEPT=$ALWAYS_EXCEPT ONLY=$SANITYN_ONLY bash sanityn.sh - rc=$? - return $rc + return 0 } run_test sanityn "Run sanityn with PFL layout" -- 1.8.3.1