diff mbox series

fstests: btrfs/021: redirect the output of defrag command

Message ID 20221113020841.40180-1-wqu@suse.com (mailing list archive)
State New, archived
Headers show
Series fstests: btrfs/021: redirect the output of defrag command | expand

Commit Message

Qu Wenruo Nov. 13, 2022, 2:08 a.m. UTC
[BUG]
Test case btrfs/021 will fail with v6.0 btrfs-progs, with the extra
output:

     QA output created by 021
    +/mnt/scratch/padding-0
    +/mnt/scratch/padding-1
    +/mnt/scratch/padding-2
    +/mnt/scratch/padding-3
    +/mnt/scratch/padding-4
    +/mnt/scratch/padding-5
    ...

[CAUSE]
In fact this is a btrfs-progs bug, btrfs-progs commit db2f85c8751c
("btrfs-progs: fi defrag: add global verbose option") changed the output
level of defrag command.

[FIX]
This will be fixed in btrfs-progs, while as a workaround we can redirect
the stdout into $seqres.full.

If we hit some error, the stderr will still pollute the golden output
and be caught by the test case.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
 tests/btrfs/021 | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Filipe Manana Nov. 14, 2022, 10:33 a.m. UTC | #1
On Sun, Nov 13, 2022 at 2:31 AM Qu Wenruo <wqu@suse.com> wrote:
>
> [BUG]
> Test case btrfs/021 will fail with v6.0 btrfs-progs, with the extra
> output:
>
>      QA output created by 021
>     +/mnt/scratch/padding-0
>     +/mnt/scratch/padding-1
>     +/mnt/scratch/padding-2
>     +/mnt/scratch/padding-3
>     +/mnt/scratch/padding-4
>     +/mnt/scratch/padding-5
>     ...
>
> [CAUSE]
> In fact this is a btrfs-progs bug, btrfs-progs commit db2f85c8751c
> ("btrfs-progs: fi defrag: add global verbose option") changed the output
> level of defrag command.
>
> [FIX]
> This will be fixed in btrfs-progs, while as a workaround we can redirect
> the stdout into $seqres.full.
>
> If we hit some error, the stderr will still pollute the golden output
> and be caught by the test case.
>
> Signed-off-by: Qu Wenruo <wqu@suse.com>
> ---
>  tests/btrfs/021 | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/btrfs/021 b/tests/btrfs/021
> index 5943da2f..6b6383cb 100755
> --- a/tests/btrfs/021
> +++ b/tests/btrfs/021
> @@ -23,7 +23,7 @@ run_test()
>         sleep 0.5
>
>         find $SCRATCH_MNT -type f -print0 | xargs -0 \
> -       $BTRFS_UTIL_PROG filesystem defrag -f
> +       $BTRFS_UTIL_PROG filesystem defrag -f >> $seqres.full

Already sent a fix for this last week (plus this misses btrfs/256):

https://lore.kernel.org/fstests/e393451cb53b6b81804eaa41c6461b07a910eb62.1668011769.git.fdmanana@suse.com/

Thanks.

>
>         sync
>         wait
> --
> 2.38.0
>
diff mbox series

Patch

diff --git a/tests/btrfs/021 b/tests/btrfs/021
index 5943da2f..6b6383cb 100755
--- a/tests/btrfs/021
+++ b/tests/btrfs/021
@@ -23,7 +23,7 @@  run_test()
 	sleep 0.5
 
 	find $SCRATCH_MNT -type f -print0 | xargs -0 \
-	$BTRFS_UTIL_PROG filesystem defrag -f
+	$BTRFS_UTIL_PROG filesystem defrag -f >> $seqres.full
 
 	sync
 	wait