apfs/apfstests
0
0
Fork 0
mirror of https://github.com/linux-apfs/apfstests.git synced 2026-05-01 15:01:44 -07:00
Code Issues Packages Projects Releases Wiki Activity

btrfs: stop using run_check in _run_btrfs_balance_start

Browse Source 
The use of run_check() immediately stops a test because it calls the
_fail() function when execution of its argument fails. This is
generally not encouraged in fstests as it prevents a test from
detecting further problems after that failure.

Since the next patch in this series updates other tests to use
_run_btrfs_balance_start() for which a failure to run balance can be
expected (btrfs/187 for example), remove the use of run_check() from
_run_btrfs_balance_start(). Existing tests that use
_run_btrfs_balance_start() now redirect standard output to the
test's .full file for debugging purposes. In case balance fails the
tests will fail due to unexpected output from the standard error.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>
This commit is contained in:
Filipe Manana
2020-04-14 17:22:32 +01:00
committed by Eryu Guan
parent ab3b7f026e
commit af3d0c0ea9
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/btrfs/124
+1 -1
View File
@@ -114,7 +114,7 @@ _run_btrfs_util_prog device scan
_scratch_mount >> $seqres.full 2>&1
_run_btrfs_util_prog filesystem show
echo >> $seqres.full
_run_btrfs_balance_start ${SCRATCH_MNT}
_run_btrfs_balance_start ${SCRATCH_MNT} >>$seqres.full
checkpoint2=`md5sum $SCRATCH_MNT/tf2`
echo $checkpoint2 >> $seqres.full 2>&1
tests/btrfs/177
+2 -2
View File
@@ -44,7 +44,7 @@ _scratch_mount
# Create a small file and run balance so we shall deal with the chunk
# size as allocated by the kernel, mkfs allocated chunks are smaller.
dd if=/dev/zero of="$SCRATCH_MNT/fill" bs=4096 count=1 >> $seqres.full 2>&1
_run_btrfs_balance_start "$SCRATCH_MNT"
_run_btrfs_balance_start "$SCRATCH_MNT" >>$seqres.full
# Now fill it up.
dd if=/dev/zero of="$SCRATCH_MNT/refill" bs=4096 >> $seqres.full 2>&1
@@ -63,7 +63,7 @@ rm -f "$SCRATCH_MNT/refill"
# Get rid of empty block groups and also make sure that balance skips block
# groups containing active swap files.
_run_btrfs_balance_start "$SCRATCH_MNT"
_run_btrfs_balance_start "$SCRATCH_MNT" >>$seqres.full
# Try to shrink away the area occupied by the swap file, which should fail.
$BTRFS_UTIL_PROG filesystem resize 1G "$SCRATCH_MNT" 2>&1 | grep -o "Text file busy"