Archive-Team
/
zfs
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 103 Wiki Activity

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
This commit is contained in:
Brian Behlendorf 2018-10-23 19:53:14 -07:00 committed by GitHub
parent da4f331b41
commit 3449243b6d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
tests/zfs-tests/tests/functional/projectquota/projectid_001_pos.ksh
View File

@ -63,19 +63,19 @@ log_must touch $PRJFILE
log_must mkdir $PRJDIR log_must mkdir $PRJDIR
log_must chattr -p $PRJID1 $PRJFILE 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 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 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 # "-1" is invalid project ID, should be denied
log_mustnot chattr -p -1 $PRJFILE 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 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 touch $PRJDIR/fchild
log_must eval "lsattr -p $PRJDIR/fchild | grep $PRJID1" log_must eval "lsattr -p $PRJDIR/fchild | grep $PRJID1"

10
tests/zfs-tests/tests/functional/projectquota/projecttree_001_pos.ksh
View File

@ -69,30 +69,30 @@ log_must chattr -p $PRJID1 $PRJDIR/a3
log_must eval "zfs project $PRJDIR/a3 | grep '$PRJID1 \-'" log_must eval "zfs project $PRJDIR/a3 | grep '$PRJID1 \-'"
log_must zfs project -p $PRJID2 $PRJDIR/a3 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 chattr -p $PRJID1 $PRJDIR/a1
log_must eval "zfs project -d $PRJDIR/a1 | grep '$PRJID1 \-'" log_must eval "zfs project -d $PRJDIR/a1 | grep '$PRJID1 \-'"
log_must zfs project -p $PRJID2 $PRJDIR/a1 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 chattr +P $PRJDIR/a2
log_must eval "zfs project -d $PRJDIR/a2 | grep '0 P'" log_must eval "zfs project -d $PRJDIR/a2 | grep '0 P'"
log_must zfs project -s $PRJDIR/a2 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 chattr +P -p $PRJID1 $PRJDIR/a1
log_must eval "zfs project -d $PRJDIR/a1 | grep '$PRJID1 P'" log_must eval "zfs project -d $PRJDIR/a1 | grep '$PRJID1 P'"
log_must zfs project -s -p $PRJID2 $PRJDIR/a2 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 chattr -P $PRJDIR/a1
log_must eval "zfs project -d $PRJDIR/a1 | grep '$PRJID1 \-'" log_must eval "zfs project -d $PRJDIR/a1 | grep '$PRJID1 \-'"
log_must zfs project -C -k $PRJDIR/a2 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" log_pass "Check 'zfs project' is compatible with chattr/lsattr"