| Message ID | 20220209123305.253038-4-shinichiro.kawasaki@wdc.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | fstests: fix _scratch_mkfs_sized failure handling | expand |
On Wed, Feb 09, 2022 at 09:33:02PM +0900, Shin'ichiro Kawasaki wrote: > The test cases generic/{171,172,173,174} call _scratch_mkfs before > _scratch_mkfs_sized, and they do not check return code of > _scratch_mkfs_sized. Even if _scratch_mkfs_sized failed, _scratch_mount > after it cannot detect the sized mkfs failure because _scratch_mkfs > already created a file system on the device. This results in unexpected > test condition of the test cases. > > To avoid the unexpected test condition, check return code of > _scratch_mkfs_sized in the test cases. > > Suggested-by: Naohiro Aota <naohiro.aota@wdc.com> > Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> Looks good, Reviewed-by: Darrick J. Wong <djwong@kernel.org> --D > --- > tests/generic/171 | 2 +- > tests/generic/172 | 2 +- > tests/generic/173 | 2 +- > tests/generic/174 | 2 +- > 4 files changed, 4 insertions(+), 4 deletions(-) > > diff --git a/tests/generic/171 b/tests/generic/171 > index fb2a6f14..f823a454 100755 > --- a/tests/generic/171 > +++ b/tests/generic/171 > @@ -42,7 +42,7 @@ sz_bytes=$((nr_blks * 8 * blksz)) > if [ $sz_bytes -lt $((32 * 1048576)) ]; then > sz_bytes=$((32 * 1048576)) > fi > -_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 > +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 || _fail "mkfs failed" > _scratch_mount >> $seqres.full 2>&1 > rm -rf $testdir > mkdir $testdir > diff --git a/tests/generic/172 b/tests/generic/172 > index ab5122fa..383824b9 100755 > --- a/tests/generic/172 > +++ b/tests/generic/172 > @@ -40,7 +40,7 @@ umount $SCRATCH_MNT > > file_size=$((768 * 1024 * 1024)) > fs_size=$((1024 * 1024 * 1024)) > -_scratch_mkfs_sized $fs_size >> $seqres.full 2>&1 > +_scratch_mkfs_sized $fs_size >> $seqres.full 2>&1 || _fail "mkfs failed" > _scratch_mount >> $seqres.full 2>&1 > rm -rf $testdir > mkdir $testdir > diff --git a/tests/generic/173 b/tests/generic/173 > index 0eb313e2..e1493278 100755 > --- a/tests/generic/173 > +++ b/tests/generic/173 > @@ -42,7 +42,7 @@ sz_bytes=$((nr_blks * 8 * blksz)) > if [ $sz_bytes -lt $((32 * 1048576)) ]; then > sz_bytes=$((32 * 1048576)) > fi > -_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 > +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 || _fail "mkfs failed" > _scratch_mount >> $seqres.full 2>&1 > rm -rf $testdir > mkdir $testdir > diff --git a/tests/generic/174 b/tests/generic/174 > index 1505453e..c7a177b8 100755 > --- a/tests/generic/174 > +++ b/tests/generic/174 > @@ -43,7 +43,7 @@ sz_bytes=$((nr_blks * 8 * blksz)) > if [ $sz_bytes -lt $((32 * 1048576)) ]; then > sz_bytes=$((32 * 1048576)) > fi > -_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 > +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 || _fail "mkfs failed" > _scratch_mount >> $seqres.full 2>&1 > rm -rf $testdir > mkdir $testdir > -- > 2.34.1 >
diff --git a/tests/generic/171 b/tests/generic/171 index fb2a6f14..f823a454 100755 --- a/tests/generic/171 +++ b/tests/generic/171 @@ -42,7 +42,7 @@ sz_bytes=$((nr_blks * 8 * blksz)) if [ $sz_bytes -lt $((32 * 1048576)) ]; then sz_bytes=$((32 * 1048576)) fi -_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount >> $seqres.full 2>&1 rm -rf $testdir mkdir $testdir diff --git a/tests/generic/172 b/tests/generic/172 index ab5122fa..383824b9 100755 --- a/tests/generic/172 +++ b/tests/generic/172 @@ -40,7 +40,7 @@ umount $SCRATCH_MNT file_size=$((768 * 1024 * 1024)) fs_size=$((1024 * 1024 * 1024)) -_scratch_mkfs_sized $fs_size >> $seqres.full 2>&1 +_scratch_mkfs_sized $fs_size >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount >> $seqres.full 2>&1 rm -rf $testdir mkdir $testdir diff --git a/tests/generic/173 b/tests/generic/173 index 0eb313e2..e1493278 100755 --- a/tests/generic/173 +++ b/tests/generic/173 @@ -42,7 +42,7 @@ sz_bytes=$((nr_blks * 8 * blksz)) if [ $sz_bytes -lt $((32 * 1048576)) ]; then sz_bytes=$((32 * 1048576)) fi -_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount >> $seqres.full 2>&1 rm -rf $testdir mkdir $testdir diff --git a/tests/generic/174 b/tests/generic/174 index 1505453e..c7a177b8 100755 --- a/tests/generic/174 +++ b/tests/generic/174 @@ -43,7 +43,7 @@ sz_bytes=$((nr_blks * 8 * blksz)) if [ $sz_bytes -lt $((32 * 1048576)) ]; then sz_bytes=$((32 * 1048576)) fi -_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 +_scratch_mkfs_sized $sz_bytes >> $seqres.full 2>&1 || _fail "mkfs failed" _scratch_mount >> $seqres.full 2>&1 rm -rf $testdir mkdir $testdir
The test cases generic/{171,172,173,174} call _scratch_mkfs before _scratch_mkfs_sized, and they do not check return code of _scratch_mkfs_sized. Even if _scratch_mkfs_sized failed, _scratch_mount after it cannot detect the sized mkfs failure because _scratch_mkfs already created a file system on the device. This results in unexpected test condition of the test cases. To avoid the unexpected test condition, check return code of _scratch_mkfs_sized in the test cases. Suggested-by: Naohiro Aota <naohiro.aota@wdc.com> Signed-off-by: Shin'ichiro Kawasaki <shinichiro.kawasaki@wdc.com> --- tests/generic/171 | 2 +- tests/generic/172 | 2 +- tests/generic/173 | 2 +- tests/generic/174 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-)