mirror of
https://github.com/linux-apfs/apfstests.git
synced 2026-05-01 15:01:44 -07:00
btrfs/001: filter subvol delete output
btrfs/001 is failing as the below btrfs-progs patch changed the output during subvol delete. Patch : btrfs-progs: add options to set commit mode after subvol delete adding it to the filter Signed-off-by: Anand Jain <Anand.Jain@oracle.com> Reviewed-by: Dave Chinner <dchinner@redhat.com> Signed-off-by: Dave Chinner <david@fromorbit.com>
This commit is contained in:
@@ -57,5 +57,15 @@ _filter_btrfs_device_stats()
|
||||
sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
|
||||
}
|
||||
|
||||
_filter_transcation_commit_default() {
|
||||
sed -e "/Transaction commit: none (default)/d"
|
||||
}
|
||||
|
||||
_filter_btrfs_subvol_delete()
|
||||
{
|
||||
_filter_scratch | _filter_transcation_commit_default
|
||||
|
||||
}
|
||||
|
||||
# make sure this script returns success
|
||||
/bin/true
|
||||
|
||||
+2
-1
@@ -40,6 +40,7 @@ trap "_cleanup ; exit \$status" 0 1 2 3 15
|
||||
# get standard environment, filters and checks
|
||||
. ./common/rc
|
||||
. ./common/filter
|
||||
. ./common/filter.btrfs
|
||||
|
||||
# real QA test starts here
|
||||
_supported_fs btrfs
|
||||
@@ -98,7 +99,7 @@ echo "Listing subvolumes"
|
||||
$BTRFS_UTIL_PROG subvolume list $SCRATCH_MNT | awk '{ print $NF }'
|
||||
|
||||
# Delete the snapshot
|
||||
$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_scratch
|
||||
$BTRFS_UTIL_PROG subvolume delete $SCRATCH_MNT/snap | _filter_btrfs_subvol_delete
|
||||
echo "List root dir"
|
||||
ls $SCRATCH_MNT
|
||||
_scratch_remount
|
||||
|
||||
Reference in New Issue
Block a user