FSTests Archive on lore.kernel.org
 help / color / Atom feed
From: "Darrick J. Wong" <darrick.wong@oracle.com>
To: Eryu Guan <guaneryu@gmail.com>, xfs <linux-xfs@vger.kernel.org>,
	fstests <fstests@vger.kernel.org>
Cc: "Bill O'Donnell" <billodo@redhat.com>, Eric Sandeen <sandeen@redhat.com>
Subject: [PATCH] xfs/{263,106} erase max warnings printout
Date: Thu, 30 Jul 2020 11:35:33 -0700
Message-ID: <20200730183533.GB67809@magnolia> (raw)

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>
---
 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()

             reply index

Thread overview: 2+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2020-07-30 18:35 Darrick J. Wong [this message]
2020-08-03 13:17 ` Bill O'Donnell

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20200730183533.GB67809@magnolia \
    --to=darrick.wong@oracle.com \
    --cc=billodo@redhat.com \
    --cc=fstests@vger.kernel.org \
    --cc=guaneryu@gmail.com \
    --cc=linux-xfs@vger.kernel.org \
    --cc=sandeen@redhat.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

FSTests Archive on lore.kernel.org

Archives are clonable:
	git clone --mirror https://lore.kernel.org/fstests/0 fstests/git/0.git

	# If you have public-inbox 1.1+ installed, you may
	# initialize and index your mirror using the following commands:
	public-inbox-init -V2 fstests fstests/ https://lore.kernel.org/fstests \
		fstests@vger.kernel.org
	public-inbox-index fstests

Example config snippet for mirrors

Newsgroup available over NNTP:
	nntp://nntp.lore.kernel.org/org.kernel.vger.fstests


AGPL code for this site: git clone https://public-inbox.org/public-inbox.git