xfs/106: fix golden output regression in quota off test

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>
Reviewed-by: Eryu Guan <guaneryu@gmail.com>
Signed-off-by: Eryu Guan <guaneryu@gmail.com>

diff --git a/tests/xfs/106 b/tests/xfs/106
index d8f55441e5eae57871b1c8291fdcd95211b198ae..fc2281af52cb9f85ed297f807832aa252ec001e0 100755 (executable)
--- a/tests/xfs/106
+++ b/tests/xfs/106
@@ -155,6 +155,7 @@ test_enable()
 
 test_off()
 {
 
 test_off()
 {

+       echo "turning quota off by remounting"

        _scratch_unmount
        _qmount_option ""
        _qmount
        _scratch_unmount
        _qmount_option ""
        _qmount

diff --git a/tests/xfs/106.out b/tests/xfs/106.out
index 3e6805a6af09133941dc2d7d647f6facfa2d5338..7c7be6b1ee13ef5cb4b97b880adb28f06f731c54 100644 (file)
--- 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]
 
 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
 
 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]
 
 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
 
 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]
 
 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
 
 checking remove command (type=p)
 Project quota are not enabled on SCRATCH_DEV