[1/2,v2] xfstests: make btrfs/001.out in line with subvol delete output
diff mbox

Message ID 1389669828-2222-1-git-send-email-anand.jain@oracle.com
State Not Applicable
Headers show

Commit Message

Anand Jain Jan. 14, 2014, 3:23 a.m. UTC
From: Anand Jain <Anand.Jain@oracle.com>

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>
---
 v2: accepts Wang suggested

 common/filter       |    4 ++++
 common/filter.btrfs |    6 ++++++
 tests/btrfs/001     |    3 ++-
 3 files changed, 12 insertions(+), 1 deletions(-)

Comments

David Sterba Jan. 15, 2014, 2:19 p.m. UTC | #1
On Tue, Jan 14, 2014 at 11:23:48AM +0800, Anand Jain wrote:
> --- a/common/filter
> +++ b/common/filter
> @@ -313,5 +313,9 @@ _filter_ro_mount() {
>  	    -e "s/mount: cannot mount block device/mount: cannot mount/g"
>  }
>  
> +_filter_transcation_commit_default() {
> +	sed -e "/Transaction commit: none (default)/d"
> +}

This IMO belongs to filters.btrfs

> +
>  # make sure this script returns success
>  /bin/true
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Patch
diff mbox

diff --git a/common/filter b/common/filter
index c872a27..3842c1b 100644
--- a/common/filter
+++ b/common/filter
@@ -313,5 +313,9 @@  _filter_ro_mount() {
 	    -e "s/mount: cannot mount block device/mount: cannot mount/g"
 }
 
+_filter_transcation_commit_default() {
+	sed -e "/Transaction commit: none (default)/d"
+}
+
 # make sure this script returns success
 /bin/true
diff --git a/common/filter.btrfs b/common/filter.btrfs
index 29512cd..563dff4 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -56,5 +56,11 @@  _filter_btrfs_device_stats()
 	sed -e "s/ *$NUMDEVS /<NUMDEVS> /g"
 }
 
+_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 c05d772..8258d06 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