| Message ID | 20200730183533.GB67809@magnolia (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | xfs/{263,106} erase max warnings printout | expand |
On Thu, Jul 30, 2020 at 11:35:33AM -0700, Darrick J. Wong wrote: > From: Darrick J. Wong <darrick.wong@oracle.com> > > Both of these tests encode the xfs_quota output in the golden output. > Now that we've changed xfs_quota to emit max warnings, we have to fix > the test to avoid regressions. > > Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com> Looks good. Reviewed-by: Bill O'Donnell <billodo@redhat.com> > --- > tests/xfs/106 | 3 ++- > tests/xfs/263 | 4 +++- > 2 files changed, 5 insertions(+), 2 deletions(-) > > diff --git a/tests/xfs/106 b/tests/xfs/106 > index 7a71ec09..e6a9b3d1 100755 > --- a/tests/xfs/106 > +++ b/tests/xfs/106 > @@ -96,7 +96,8 @@ filter_state() > { > _filter_quota | sed -e "s/Inode: #[0-9]* (0 blocks, 0 extents)/Inode: #[INO] (0 blocks, 0 extents)/g" \ > -e "s/Inode: #[0-9]* ([0-9]* blocks, [0-9]* extents)/Inode: #[INO] (X blocks, Y extents)/g" \ > - -e "/[0-9][0-9]:[0-9][0-9]:[0-9][0-9]/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]//g" > + -e "/[0-9][0-9]:[0-9][0-9]:[0-9][0-9]/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]//g" \ > + -e '/max warnings:/d' > } > > test_quot() > diff --git a/tests/xfs/263 b/tests/xfs/263 > index 578f9ee7..2f23318d 100755 > --- a/tests/xfs/263 > +++ b/tests/xfs/263 > @@ -57,7 +57,9 @@ function option_string() > } > > filter_quota_state() { > - sed -e 's/Inode: #[0-9]\+/Inode #XXX/g' | _filter_scratch > + sed -e 's/Inode: #[0-9]\+/Inode #XXX/g' \ > + -e '/max warnings:/d' \ > + | _filter_scratch > } > > function test_all_state() >
diff --git a/tests/xfs/106 b/tests/xfs/106 index 7a71ec09..e6a9b3d1 100755 --- a/tests/xfs/106 +++ b/tests/xfs/106 @@ -96,7 +96,8 @@ filter_state() { _filter_quota | sed -e "s/Inode: #[0-9]* (0 blocks, 0 extents)/Inode: #[INO] (0 blocks, 0 extents)/g" \ -e "s/Inode: #[0-9]* ([0-9]* blocks, [0-9]* extents)/Inode: #[INO] (X blocks, Y extents)/g" \ - -e "/[0-9][0-9]:[0-9][0-9]:[0-9][0-9]/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]//g" + -e "/[0-9][0-9]:[0-9][0-9]:[0-9][0-9]/s/ [0-9][0-9]:[0-9][0-9]:[0-9][0-9]//g" \ + -e '/max warnings:/d' } test_quot() diff --git a/tests/xfs/263 b/tests/xfs/263 index 578f9ee7..2f23318d 100755 --- a/tests/xfs/263 +++ b/tests/xfs/263 @@ -57,7 +57,9 @@ function option_string() } filter_quota_state() { - sed -e 's/Inode: #[0-9]\+/Inode #XXX/g' | _filter_scratch + sed -e 's/Inode: #[0-9]\+/Inode #XXX/g' \ + -e '/max warnings:/d' \ + | _filter_scratch } function test_all_state()