Skip to contentSkip to conversation

xfs/{263,106} erase max warnings printout

PATCH In review Darrick J. Wong 2 participants 2 messages Jul 30, 2020 – Aug 3, 2020

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 xfs/{263,106} erase max warnings printout

From: Darrick J. Wong <[email protected]>

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.

---
 tests/xfs/106 |    3 ++-
 tests/xfs/263 |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)
tests/xfs/106 +2 -1
index 7a71ec09..e6a9b3d1 100755
@@ -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()
tests/xfs/263 +3 -1
index 578f9ee7..2f23318d 100755
@@ -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()
Reviewed-by on v1 1/1
#1 lore raw
Quoted 7 lines · Darrick J. Wong

From: Darrick J. Wong <[email protected]>

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.

Looks good.

Quoted 35 lines
---
 tests/xfs/106 |    3 ++-
 tests/xfs/263 |    4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)
tests/xfs/106 +2 -1
index 7a71ec09..e6a9b3d1 100755
@@ -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()
tests/xfs/263 +3 -1
index 578f9ee7..2f23318d 100755
@@ -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()