diff mbox series

btrfs: fix btrfs/271 failure due to missing source of fail_make_request

Message ID 62ccab661ea8591cbc5f8b936fc4e0a47f2bfc86.1662063388.git.fdmanana@suse.com (mailing list archive)
State New, archived
Headers show
Series btrfs: fix btrfs/271 failure due to missing source of fail_make_request | expand

Commit Message

Filipe Manana Sept. 1, 2022, 8:17 p.m. UTC
From: Filipe Manana <fdmanana@suse.com>

The recent commit 49272aacac850c ("common: refactor fail_make_request
boilerplate") moved _require_fail_make_request() from common/rc into
common/fail_make_request, but it forgot to make btrfs/271 source this
new file, so now the test always fails:

  $ ./check btrfs/271
  FSTYP         -- btrfs
  PLATFORM      -- Linux/x86_64 debian9 6.0.0-rc2-btrfs-next-122 #1 SMP PREEMPT_DYNAMIC Mon Aug 29 09:45:59 WEST 2022
  MKFS_OPTIONS  -- /dev/sdb
  MOUNT_OPTIONS -- /dev/sdb /home/fdmanana/btrfs-tests/scratch_1

  btrfs/271 4s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/271.out.bad)
      --- tests/btrfs/271.out	2022-08-08 10:36:20.404812893 +0100
      +++ /home/fdmanana/git/hub/xfstests/results//btrfs/271.out.bad	2022-09-01 21:12:29.689481068 +0100
      @@ -1,4 +1,5 @@
       QA output created by 271
      +/home/fdmanana/git/hub/xfstests/tests/btrfs/271: line 17: _require_fail_make_request: command not found
       Step 1: writing with one failing mirror:
       wrote 8192/8192 bytes at offset 0
       XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
      ...
      (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/271.out /home/fdmanana/git/hub/xfstests/results//btrfs/271.out.bad'  to see the entire diff)
  Ran: btrfs/271
  Failures: btrfs/271
  Failed 1 of 1 tests

Fix that by sourcing common/fail_make_request at btrfs/271.

Signed-off-by: Filipe Manana <fdmanana@suse.com>
---
 tests/btrfs/271 | 1 +
 1 file changed, 1 insertion(+)

Comments

Zorro Lang Sept. 2, 2022, 2:27 a.m. UTC | #1
On Thu, Sep 01, 2022 at 09:17:02PM +0100, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
> 
> The recent commit 49272aacac850c ("common: refactor fail_make_request
> boilerplate") moved _require_fail_make_request() from common/rc into
> common/fail_make_request, but it forgot to make btrfs/271 source this
> new file, so now the test always fails:
> 
>   $ ./check btrfs/271
>   FSTYP         -- btrfs
>   PLATFORM      -- Linux/x86_64 debian9 6.0.0-rc2-btrfs-next-122 #1 SMP PREEMPT_DYNAMIC Mon Aug 29 09:45:59 WEST 2022
>   MKFS_OPTIONS  -- /dev/sdb
>   MOUNT_OPTIONS -- /dev/sdb /home/fdmanana/btrfs-tests/scratch_1
> 
>   btrfs/271 4s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/271.out.bad)
>       --- tests/btrfs/271.out	2022-08-08 10:36:20.404812893 +0100
>       +++ /home/fdmanana/git/hub/xfstests/results//btrfs/271.out.bad	2022-09-01 21:12:29.689481068 +0100
>       @@ -1,4 +1,5 @@
>        QA output created by 271
>       +/home/fdmanana/git/hub/xfstests/tests/btrfs/271: line 17: _require_fail_make_request: command not found
>        Step 1: writing with one failing mirror:
>        wrote 8192/8192 bytes at offset 0
>        XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
>       ...
>       (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/271.out /home/fdmanana/git/hub/xfstests/results//btrfs/271.out.bad'  to see the entire diff)
>   Ran: btrfs/271
>   Failures: btrfs/271
>   Failed 1 of 1 tests
> 
> Fix that by sourcing common/fail_make_request at btrfs/271.
> 
> Signed-off-by: Filipe Manana <fdmanana@suse.com>
> ---

Thanks for fixing it! Looks like we missed the btrfs/271 ...

  $ grep -rsn _require_fail_make_request tests/
  tests/btrfs/271:16:_require_fail_make_request
  tests/btrfs/088:26:_require_fail_make_request
  tests/btrfs/150:25:_require_fail_make_request
  tests/generic/019:21:_require_fail_make_request

Reviewed-by: Zorro Lang <zlang@redhat.com>

>  tests/btrfs/271 | 1 +
>  1 file changed, 1 insertion(+)
> 
> diff --git a/tests/btrfs/271 b/tests/btrfs/271
> index c21858d1..681fa965 100755
> --- a/tests/btrfs/271
> +++ b/tests/btrfs/271
> @@ -10,6 +10,7 @@
>  _begin_fstest auto quick raid
>  
>  . ./common/filter
> +. ./common/fail_make_request
>  
>  _supported_fs btrfs
>  _require_scratch
> -- 
> 2.35.1
>
Zorro Lang Sept. 2, 2022, 4:38 a.m. UTC | #2
On Fri, Sep 02, 2022 at 10:27:51AM +0800, Zorro Lang wrote:
> On Thu, Sep 01, 2022 at 09:17:02PM +0100, fdmanana@kernel.org wrote:
> > From: Filipe Manana <fdmanana@suse.com>
> > 
> > The recent commit 49272aacac850c ("common: refactor fail_make_request
> > boilerplate") moved _require_fail_make_request() from common/rc into
> > common/fail_make_request, but it forgot to make btrfs/271 source this
> > new file, so now the test always fails:
> > 
> >   $ ./check btrfs/271
> >   FSTYP         -- btrfs
> >   PLATFORM      -- Linux/x86_64 debian9 6.0.0-rc2-btrfs-next-122 #1 SMP PREEMPT_DYNAMIC Mon Aug 29 09:45:59 WEST 2022
> >   MKFS_OPTIONS  -- /dev/sdb
> >   MOUNT_OPTIONS -- /dev/sdb /home/fdmanana/btrfs-tests/scratch_1
> > 
> >   btrfs/271 4s ... - output mismatch (see /home/fdmanana/git/hub/xfstests/results//btrfs/271.out.bad)
> >       --- tests/btrfs/271.out	2022-08-08 10:36:20.404812893 +0100
> >       +++ /home/fdmanana/git/hub/xfstests/results//btrfs/271.out.bad	2022-09-01 21:12:29.689481068 +0100
> >       @@ -1,4 +1,5 @@
> >        QA output created by 271
> >       +/home/fdmanana/git/hub/xfstests/tests/btrfs/271: line 17: _require_fail_make_request: command not found
> >        Step 1: writing with one failing mirror:
> >        wrote 8192/8192 bytes at offset 0
> >        XXX Bytes, X ops; XX:XX:XX.X (XXX YYY/sec and XXX ops/sec)
> >       ...
> >       (Run 'diff -u /home/fdmanana/git/hub/xfstests/tests/btrfs/271.out /home/fdmanana/git/hub/xfstests/results//btrfs/271.out.bad'  to see the entire diff)
> >   Ran: btrfs/271
> >   Failures: btrfs/271
> >   Failed 1 of 1 tests
> > 
> > Fix that by sourcing common/fail_make_request at btrfs/271.
> > 
> > Signed-off-by: Filipe Manana <fdmanana@suse.com>
> > ---
> 
> Thanks for fixing it! Looks like we missed the btrfs/271 ...
> 
>   $ grep -rsn _require_fail_make_request tests/
>   tests/btrfs/271:16:_require_fail_make_request
>   tests/btrfs/088:26:_require_fail_make_request
>   tests/btrfs/150:25:_require_fail_make_request
>   tests/generic/019:21:_require_fail_make_request
> 
> Reviewed-by: Zorro Lang <zlang@redhat.com>


Oh, Christoph has sent a patch to fix this issue:
https://lore.kernel.org/fstests/20220823193230.505544-1-hch@lst.de/

It's been reviewed but hasn't been merged (will be in this week).

Thanks,
Zorro

> 
> >  tests/btrfs/271 | 1 +
> >  1 file changed, 1 insertion(+)
> > 
> > diff --git a/tests/btrfs/271 b/tests/btrfs/271
> > index c21858d1..681fa965 100755
> > --- a/tests/btrfs/271
> > +++ b/tests/btrfs/271
> > @@ -10,6 +10,7 @@
> >  _begin_fstest auto quick raid
> >  
> >  . ./common/filter
> > +. ./common/fail_make_request
> >  
> >  _supported_fs btrfs
> >  _require_scratch
> > -- 
> > 2.35.1
> >
diff mbox series

Patch

diff --git a/tests/btrfs/271 b/tests/btrfs/271
index c21858d1..681fa965 100755
--- a/tests/btrfs/271
+++ b/tests/btrfs/271
@@ -10,6 +10,7 @@ 
 _begin_fstest auto quick raid
 
 . ./common/filter
+. ./common/fail_make_request
 
 _supported_fs btrfs
 _require_scratch