linux-xfs.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: "Darrick J. Wong" <djwong@kernel.org>
To: djwong@kernel.org, guaneryu@gmail.com
Cc: linux-xfs@vger.kernel.org, fstests@vger.kernel.org, guan@eryu.me
Subject: [PATCH 1/4] xfs/106: fix golden output regression in quota off test
Date: Tue, 27 Jul 2021 17:09:43 -0700	[thread overview]
Message-ID: <162743098324.3427426.13889210606647869531.stgit@magnolia> (raw)
In-Reply-To: <162743097757.3427426.8734776553736535870.stgit@magnolia>

From: Darrick J. Wong <djwong@kernel.org>

In commit 4c5df338, we reshuffled this test a bit in preparation to
disable quotaoff by rearranging the test to testing disabling of quota
by remounting the filesystem.  Unfortunately, extra blank lines were
added to the golden output, leading to test regressions.

The "extra" blank lines are a result of the "echo ; test_off";
test_off() itself doesn't print anything.  Make it print /something/ so
that we know what the test was trying to do when a particular line of
golden output appears, then fix the blank lines.

Fixes: 4c5df338 ("xfs/106: don't test disabling quota accounting")
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
---
 tests/xfs/106     |    1 +
 tests/xfs/106.out |    5 +++++
 2 files changed, 6 insertions(+)


diff --git a/tests/xfs/106 b/tests/xfs/106
index d8f55441..fc2281af 100755
--- a/tests/xfs/106
+++ b/tests/xfs/106
@@ -155,6 +155,7 @@ test_enable()
 
 test_off()
 {
+	echo "turning quota off by remounting"
 	_scratch_unmount
 	_qmount_option ""
 	_qmount
diff --git a/tests/xfs/106.out b/tests/xfs/106.out
index 3e6805a6..7c7be6b1 100644
--- a/tests/xfs/106.out
+++ b/tests/xfs/106.out
@@ -149,6 +149,7 @@ Blocks grace time: [3 days]
 Inodes grace time: [3 days]
 Realtime Blocks grace time: [7 days]
 
+turning quota off by remounting
 
 checking remove command (type=u)
 User quota are not enabled on SCRATCH_DEV
@@ -327,6 +328,8 @@ Blocks grace time: [3 days]
 Inodes grace time: [3 days]
 Realtime Blocks grace time: [7 days]
 
+turning quota off by remounting
+
 checking remove command (type=g)
 Group quota are not enabled on SCRATCH_DEV
 
@@ -504,6 +507,8 @@ Blocks grace time: [3 days]
 Inodes grace time: [3 days]
 Realtime Blocks grace time: [7 days]
 
+turning quota off by remounting
+
 checking remove command (type=p)
 Project quota are not enabled on SCRATCH_DEV
 


  reply	other threads:[~2021-07-28  0:09 UTC|newest]

Thread overview: 12+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2021-07-28  0:09 [PATCHSET 0/4] fstests: random fixes Darrick J. Wong
2021-07-28  0:09 ` Darrick J. Wong [this message]
2021-07-28  0:09 ` [PATCH 2/4] check: don't leave the scratch filesystem mounted after _notrun Darrick J. Wong
2021-08-01 13:02   ` Eryu Guan
2021-08-02 22:13     ` Darrick J. Wong
2021-07-28  0:09 ` [PATCH 3/4] generic/570: fix regression when SCRATCH_DEV is still formatted Darrick J. Wong
2021-08-01 13:08   ` Eryu Guan
2021-08-02 22:15     ` Darrick J. Wong
2021-07-28  0:09 ` [PATCH 4/4] check: back off the OOM score adjustment to -500 Darrick J. Wong
2021-07-28 20:00 ` [PATCH 5/4] xfs/530: skip test if user MKFS_OPTIONS screw up formatting Darrick J. Wong
2021-07-28 20:00 ` [PATCH 6/4] xfs/007: fix regressions on V4 filesystems Darrick J. Wong
2021-08-01 13:18 ` [PATCHSET 0/4] fstests: random fixes Eryu Guan

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=162743098324.3427426.13889210606647869531.stgit@magnolia \
    --to=djwong@kernel.org \
    --cc=fstests@vger.kernel.org \
    --cc=guan@eryu.me \
    --cc=guaneryu@gmail.com \
    --cc=linux-xfs@vger.kernel.org \
    /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
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).