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>

diff --git a/common/filter.btrfs b/common/filter.btrfs
index 75853f29038652406935187b76b34d369f4106c8..c9b3f3a8924d2adde477b72b9f6606131530da6b 100644 (file)
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -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

diff --git a/tests/btrfs/001 b/tests/btrfs/001
index c05d772897305f78fa24fd53e42066aff81216ab..8258d065787be6da3648bfbbfc0ca71e4c0b3cbe 100755 (executable)
--- a/tests/btrfs/001
+++ b/tests/btrfs/001
@@ -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