diff options
| author | Naohiro Aota <naohiro.aota@wdc.com> | 2023-12-22 11:56:22 +0900 |
|---|---|---|
| committer | Zorro Lang <zlang@kernel.org> | 2023-12-24 03:14:21 +0800 |
| commit | 17324dbc7743902aec349d12ccad91b3cb6005c5 (patch) | |
| tree | 815680222e5988b9d3b2773967ca0d696e3338af /tests/btrfs/276 | |
| parent | d6e9d32578afc1da2dd398cc46018f0a51d7875c (diff) | |
fstests: btrfs: use proper filter for subvolume deletionv2023.12.25
Test cases btrfs/208, 233, 276 does not use _filter_btrfs_subvol_delete()
to process "btrfs subvolume delete" command's output. So, the following
diff occurs even with a previous fix.
btrfs/208 - output mismatch (see /host/btrfs/208.out.bad)
--- tests/btrfs/208.out 2023-12-22 02:09:18.000000000 +0000
+++ /host/btrfs/208.out.bad 2023-12-22 02:21:40.697036486 +0000
@@ -6,12 +6,12 @@
subvol1
subvol2
subvol3
-Delete subvolume (no-commit): 'SCRATCH_MNT/subvol1'
+Delete subvolume 256 (no-commit): 'SCRATCH_MNT/subvol1'
After deleting one subvolume:
subvol2
...
Let them use the filter and fix the output accordingly.
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Reviewed-by: David Disseldorp <ddiss@suse.de>
Signed-off-by: Zorro Lang <zlang@kernel.org>
Diffstat (limited to 'tests/btrfs/276')
| -rwxr-xr-x | tests/btrfs/276 | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/tests/btrfs/276 b/tests/btrfs/276 index 6470a2f6..f15f2082 100755 --- a/tests/btrfs/276 +++ b/tests/btrfs/276 @@ -12,6 +12,7 @@ _begin_fstest auto snapshot fiemap remount . ./common/filter +. ./common/filter.btrfs . ./common/attr _supported_fs btrfs @@ -130,7 +131,7 @@ echo "Number of non-shared extents in range [512K, 512K + 64K): $(count_not_shar echo "Number of non-shared extents in range [249M, 249M + 64K): $(count_not_shared_extents 249M 64K)" # Now delete the snapshot. -$BTRFS_UTIL_PROG subvolume delete -c $SCRATCH_MNT/snap | _filter_scratch +$BTRFS_UTIL_PROG subvolume delete -c $SCRATCH_MNT/snap | _filter_btrfs_subvol_delete # We deleted the snapshot and committed the transaction used to delete it (-c), # but all its extents (both metadata and data) are actually only deleted in the |