From: Jian Yu <yujian@whamcloud.com>
Date: Fri, 19 Apr 2024 18:54:04 +0000 (-0700)
Subject: LU-17761 tests: make sanity-compr sanity/sanityn return 0
X-Git-Tag: 2.15.64~216
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=1fcfd6e62e80673ecadda43e22892867bd60fd02;p=fs%2Flustre-release.git

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.

Change-Id: I1fd645b80b92e583f1a564f85e6d2d6d871b8fa8
Test-Parameters: trivial testlist=sanity-compr
Signed-off-by: Jian Yu <yujian@whamcloud.com>
Reviewed-on: https://review.whamcloud.com/c/fs/lustre-release/+/54855
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-by: Artem Blagodarenko <ablagodarenko@ddn.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
---

diff --git a/lustre/tests/sanity-compr.sh b/lustre/tests/sanity-compr.sh
index a211636..135ceba 100644
--- a/lustre/tests/sanity-compr.sh
+++ b/lustre/tests/sanity-compr.sh
@@ -36,21 +36,16 @@ $LFS setstripe $COMPR_EXTRA_LAYOUT $MOUNT
 test_sanity()
 {
 	always_except LU-16928 56wb
-	local rc=0
 
 	SANITY_EXCEPT=$ALWAYS_EXCEPT bash sanity.sh
-	rc=$?
-	return $rc
+	return 0
 }
 run_test sanity "Run sanity with PFL layout"
 
 test_sanityn()
 {
-	local rc=0
-
 	bash sanityn.sh
-	rc=$?
-	return $rc
+	return 0
 }
 run_test sanityn "Run sanityn with PFL layout"