From 7cb5299caaafb13e7d85c8039c00d9c22ed6a273 Mon Sep 17 00:00:00 2001 From: Anand Jain Date: Mon, 20 Jan 2014 13:28:38 +1100 Subject: [PATCH] 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 Reviewed-by: Dave Chinner Signed-off-by: Dave Chinner --- common/filter.btrfs | 10 ++++++++++ tests/btrfs/001 | 3 ++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/common/filter.btrfs b/common/filter.btrfs index 75853f29..c9b3f3a8 100644 --- a/common/filter.btrfs +++ b/common/filter.btrfs @@ -57,5 +57,15 @@ _filter_btrfs_device_stats() sed -e "s/ *$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 c05d7728..8258d065 100755 --- 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 -- 2.39.5