diff mbox series

[v2] btrfs: update some tests to be able to run with btrfs-progs v6.11

Message ID e75725e3d3c50922892ca07cd2b0965340c228be.1728300476.git.fdmanana@suse.com (mailing list archive)
State New, archived
Headers show
Series [v2] btrfs: update some tests to be able to run with btrfs-progs v6.11 | expand

Commit Message

Filipe Manana Oct. 7, 2024, 11:32 a.m. UTC 
From: Filipe Manana <fdmanana@suse.com>

In btrfs-progs v6.11 the output of the "filesystem show" command changed
so that it no longers prints blank lines. This happened with commit
4331bfb011bd ("btrfs-progs: fi show: remove stray newline in filesystem
show").

We have some tests that expect the blank lines in their golden output,
and therefore they fail with btrfs-progs v6.11.

So update the filter _filter_btrfs_filesystem_show to remove blank lines
and change the golden output of the tests to not expect the blank lines,
making the tests work with btrfs-progs v6.11 and older versions.

Reviewed-by: Boris Burkov <boris@bur.io>
Reviewed-by: Qu Wenruo <wqu@suse.com>
Signed-off-by: Filipe Manana <fdmanana@suse.com>
---

V2: Add missing updates to btrfs/006 and btrfs/100.

 common/filter.btrfs | 5 ++++-
 tests/btrfs/006.out | 2 --
 tests/btrfs/100.out | 2 --
 tests/btrfs/101.out | 2 --
 tests/btrfs/218.out | 1 -
 tests/btrfs/254.out | 1 -
 6 files changed, 4 insertions(+), 9 deletions(-)

Comments

David Sterba Oct. 10, 2024, 9:01 p.m. UTC | #1 
On Mon, Oct 07, 2024 at 12:32:50PM +0100, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
> 
> In btrfs-progs v6.11 the output of the "filesystem show" command changed
> so that it no longers prints blank lines. This happened with commit
> 4331bfb011bd ("btrfs-progs: fi show: remove stray newline in filesystem
> show").
> 
> We have some tests that expect the blank lines in their golden output,
> and therefore they fail with btrfs-progs v6.11.
> 
> So update the filter _filter_btrfs_filesystem_show to remove blank lines
> and change the golden output of the tests to not expect the blank lines,
> making the tests work with btrfs-progs v6.11 and older versions.
> 
> Reviewed-by: Boris Burkov <boris@bur.io>
> Reviewed-by: Qu Wenruo <wqu@suse.com>
> Signed-off-by: Filipe Manana <fdmanana@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
diff mbox series

Patch

diff --git a/common/filter.btrfs b/common/filter.btrfs
index 5a944aeb..bc914642 100644
--- a/common/filter.btrfs
+++ b/common/filter.btrfs
@@ -30,7 +30,10 @@  _filter_btrfs_filesystem_show()
 		UUID=$2
 	fi
 
-	# the uniq collapses all device lines into 1
+	# Before btrfs-progs v6.11 we had some blank lines in the output, so
+	# delete them.
+	# The uniq collapses all device lines into 1.
+	sed -e "/^\s*$/d" | \
 	_filter_uuid $UUID | _filter_scratch | _filter_scratch_pool | \
 	_filter_size | _filter_btrfs_version | _filter_devid | \
 	_filter_zero_size | \
diff --git a/tests/btrfs/006.out b/tests/btrfs/006.out
index b7f29f96..97d44f13 100644
--- a/tests/btrfs/006.out
+++ b/tests/btrfs/006.out
@@ -7,12 +7,10 @@  TestLabel.006
 Label: 'TestLabel.006'  uuid: <UUID>
 	Total devices <EXACTNUM> FS bytes used <SIZE>
 	devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
-
 == Show filesystem by UUID
 Label: 'TestLabel.006'  uuid: <EXACTUUID>
 	Total devices <EXACTNUM> FS bytes used <SIZE>
 	devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
-
 == Sync filesystem
 == Show device stats by mountpoint
 <NUMDEVS> [SCRATCH_DEV].corruption_errs <NUM>
diff --git a/tests/btrfs/100.out b/tests/btrfs/100.out
index aa492919..1fe3c0de 100644
--- a/tests/btrfs/100.out
+++ b/tests/btrfs/100.out
@@ -3,9 +3,7 @@  Label: none  uuid: <UUID>
 	Total devices <NUM> FS bytes used <SIZE>
 	devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
 	devid <DEVID> size <SIZE> used <SIZE> path /dev/mapper/error-test
-
 Label: none  uuid: <UUID>
 	Total devices <NUM> FS bytes used <SIZE>
 	devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
-
 === device replace completed
diff --git a/tests/btrfs/101.out b/tests/btrfs/101.out
index e1b88c2d..c2359c7c 100644
--- a/tests/btrfs/101.out
+++ b/tests/btrfs/101.out
@@ -3,9 +3,7 @@  Label: none  uuid: <UUID>
 	Total devices <NUM> FS bytes used <SIZE>
 	devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
 	devid <DEVID> size <SIZE> used <SIZE> path /dev/mapper/error-test
-
 Label: none  uuid: <UUID>
 	Total devices <NUM> FS bytes used <SIZE>
 	devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
-
 === device delete completed
diff --git a/tests/btrfs/218.out b/tests/btrfs/218.out
index 7ccf13e9..be11074c 100644
--- a/tests/btrfs/218.out
+++ b/tests/btrfs/218.out
@@ -2,7 +2,6 @@  QA output created by 218
 Label: none  uuid: <UUID>
 	Total devices <NUM> FS bytes used <SIZE>
 	devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
-
 [SCRATCH_DEV].write_io_errs    0
 [SCRATCH_DEV].read_io_errs     0
 [SCRATCH_DEV].flush_io_errs    0
diff --git a/tests/btrfs/254.out b/tests/btrfs/254.out
index 20819cf5..86089ee3 100644
--- a/tests/btrfs/254.out
+++ b/tests/btrfs/254.out
@@ -3,4 +3,3 @@  Label: none  uuid: <UUID>
 	Total devices <NUM> FS bytes used <SIZE>
 	devid <DEVID> size <SIZE> used <SIZE> path SCRATCH_DEV
 	*** Some devices missing
-