From f51a5ac995b6d855f98d65352141ac3635b6b113 Mon Sep 17 00:00:00 2001
From: Brian Behlendorf <behlendorf1@llnl.gov>
Date: Tue, 23 Oct 2018 19:53:14 -0700
Subject: [PATCH] ZTS: Update project quota tests

e2fsprogs v1.44.1, which provides lsattr, added a new attribute
for ext3 called "verity".  It is reported after the project quota
flag as a 'V' character in the `lsattr` output.

Update projectid_001_pos.ksh and projecttree_001_pos.ksh to use
a pattern which will match the expected output in both cases.

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Tony Hutter <hutter2@llnl.gov>
Signed-off-by: Brian Behlendorf <behlendorf1@llnl.gov>
Closes #8043
---
 .../functional/projectquota/projectid_001_pos.ksh      | 10 +++++-----
 .../functional/projectquota/projecttree_001_pos.ksh    | 10 +++++-----
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/tests/zfs-tests/tests/functional/projectquota/projectid_001_pos.ksh b/tests/zfs-tests/tests/functional/projectquota/projectid_001_pos.ksh
index 5f56d885caf3..7cd6925797f1 100755
--- a/tests/zfs-tests/tests/functional/projectquota/projectid_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/projectquota/projectid_001_pos.ksh
@@ -63,19 +63,19 @@ log_must touch $PRJFILE
 log_must mkdir $PRJDIR
 
 log_must chattr -p $PRJID1 $PRJFILE
-log_must eval "lsattr -p $PRJFILE | grep $PRJID1 | grep '\- '"
+log_must eval "lsattr -p $PRJFILE | grep $PRJID1 | grep -v '\-P[- ]* '"
 log_must chattr -p $PRJID1 $PRJDIR
-log_must eval "lsattr -pd $PRJDIR | grep $PRJID1 | grep '\- '"
+log_must eval "lsattr -pd $PRJDIR | grep $PRJID1 | grep -v '\-P[- ]* '"
 
 log_must chattr +P $PRJDIR
-log_must eval "lsattr -pd $PRJDIR | grep $PRJID1 | grep '\-P '"
+log_must eval "lsattr -pd $PRJDIR | grep $PRJID1 | grep '\-P[- ]* '"
 
 # "-1" is invalid project ID, should be denied
 log_mustnot chattr -p -1 $PRJFILE
-log_must eval "lsattr -p $PRJFILE | grep $PRJID1 | grep '\- '"
+log_must eval "lsattr -p $PRJFILE | grep $PRJID1 | grep -v '\-P[- ]* '"
 
 log_must mkdir $PRJDIR/dchild
-log_must eval "lsattr -pd $PRJDIR/dchild | grep $PRJID1 | grep '\-P '"
+log_must eval "lsattr -pd $PRJDIR/dchild | grep $PRJID1 | grep '\-P[- ]* '"
 log_must touch $PRJDIR/fchild
 log_must eval "lsattr -p $PRJDIR/fchild | grep $PRJID1"
 
diff --git a/tests/zfs-tests/tests/functional/projectquota/projecttree_001_pos.ksh b/tests/zfs-tests/tests/functional/projectquota/projecttree_001_pos.ksh
index 570e6a8acffa..1e4ef309f1d8 100755
--- a/tests/zfs-tests/tests/functional/projectquota/projecttree_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/projectquota/projecttree_001_pos.ksh
@@ -69,30 +69,30 @@ log_must chattr -p $PRJID1 $PRJDIR/a3
 log_must eval "zfs project $PRJDIR/a3 | grep '$PRJID1 \-'"
 
 log_must zfs project -p $PRJID2 $PRJDIR/a3
-log_must eval "lsattr -p $PRJDIR/a3 | grep $PRJID2 | grep '\- '"
+log_must eval "lsattr -p $PRJDIR/a3 | grep $PRJID2 | grep -v '\-P[- ]* '"
 
 log_must chattr -p $PRJID1 $PRJDIR/a1
 log_must eval "zfs project -d $PRJDIR/a1 | grep '$PRJID1 \-'"
 
 log_must zfs project -p $PRJID2 $PRJDIR/a1
-log_must eval "lsattr -pd $PRJDIR/a1 | grep $PRJID2 | grep '\- '"
+log_must eval "lsattr -pd $PRJDIR/a1 | grep $PRJID2 | grep -v '\-P[- ]* '"
 
 log_must chattr +P $PRJDIR/a2
 log_must eval "zfs project -d $PRJDIR/a2 | grep '0 P'"
 
 log_must zfs project -s $PRJDIR/a2
-log_must eval "lsattr -pd $PRJDIR/a2 | grep 0 | grep '\-P '"
+log_must eval "lsattr -pd $PRJDIR/a2 | grep 0 | grep '\-P[- ]* '"
 
 log_must chattr +P -p $PRJID1 $PRJDIR/a1
 log_must eval "zfs project -d $PRJDIR/a1 | grep '$PRJID1 P'"
 
 log_must zfs project -s -p $PRJID2 $PRJDIR/a2
-log_must eval "lsattr -pd $PRJDIR/a2 | grep $PRJID2 | grep '\-P '"
+log_must eval "lsattr -pd $PRJDIR/a2 | grep $PRJID2 | grep '\-P[- ]* '"
 
 log_must chattr -P $PRJDIR/a1
 log_must eval "zfs project -d $PRJDIR/a1 | grep '$PRJID1 \-'"
 
 log_must zfs project -C -k $PRJDIR/a2
-log_must eval "lsattr -pd $PRJDIR/a2 | grep $PRJID2 | grep '\- '"
+log_must eval "lsattr -pd $PRJDIR/a2 | grep $PRJID2 | grep -v '\-P[- ]* '"
 
 log_pass "Check 'zfs project' is compatible with chattr/lsattr"