From 46319ab0903ccd1a28a3011eef995e7f5cfe334e Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Wed, 1 Jun 2016 15:50:40 -0600 Subject: [PATCH] LU-7352 tests: conf-sanity 78 don't check missing files Commit b666d02e13e stopped conf-sanity test_78 failing if all of the required files could not be created. However, the test also checks later whether those files are still available after the filesystem resize. Reduce $num_files to match the number of files actually created. Test-Parameters: trivial envdefinitions=ONLY=78 testlist=conf-sanity,conf-sanity,conf-sanity,conf-sanity Test-Parameters: trivial envdefinitions=ONLY=78 testlist=conf-sanity,conf-sanity,conf-sanity,conf-sanity Signed-off-by: Andreas Dilger Change-Id: I0ccfbd3f6597167c937e75cf9b5d0892cb5cab07 Reviewed-on: http://review.whamcloud.com/20558 Reviewed-by: Wang Shilong Tested-by: Jenkins Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/tests/conf-sanity.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lustre/tests/conf-sanity.sh b/lustre/tests/conf-sanity.sh index 15b669e..9d0f17e 100755 --- a/lustre/tests/conf-sanity.sh +++ b/lustre/tests/conf-sanity.sh @@ -5193,7 +5193,10 @@ test_78() { $LCTL get_param osc.*.cur*grant* $LFS df; $LFS df -i; # stop creating files if there is no more space - [ -e $file ] || break + if [ ! -e $file ]; then + num_files=$((i - 1)) + break + fi $LFS getstripe -v $file local ost_idx=$(LFS getstripe -i $file) -- 1.8.3.1