c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2026-06-02 04:04:24 +03:00
Code Issues Packages Projects Releases Wiki Activity

ZTS: Misc fixes for FreeBSD

Browse Source 
* Check for mountd in is_shared to avoid timeout when not running
* Enhance robustness of some cleanup functions
* Simplify atime lookup
* Skip sharenfs validation for now
* Don't add mountpoint property to inheritance validation on FreeBSD

Reviewed-by: John Kennedy <john.kennedy@delphix.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Ryan Moeller <ryan@iXsystems.com>
Closes #10047
This commit is contained in:
Ryan Moeller
2020-02-25 19:23:27 -05:00
committed by GitHub
parent a33cb7e01a
commit 3a192f7d89
8 changed files with 35 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/zfs-tests/tests/functional/cli_user/misc/zdb_001_neg.ksh
+1 -5
View File
@@ -56,11 +56,7 @@ function check_zdb
function cleanup
{
if [ -e $TEST_BASE_DIR/zdb_001_neg.$$.txt ]
then
rm $TEST_BASE_DIR/zdb_001_neg.$$.txt
fi
rm -f $TEST_BASE_DIR/zdb_001_neg.$$.txt $TEST_BASE_DIR/zdb.$$
}
verify_runnable "global"
tests/zfs-tests/tests/functional/cli_user/misc/zfs_001_neg.ksh
+2 -5
View File
@@ -44,10 +44,7 @@
function cleanup
{
if [ -e "$TEMPFILE" ]
then
rm -f "$TEMPFILE"
fi
rm -f "$TEMPFILE"
}
log_onexit cleanup
@@ -55,7 +52,7 @@ log_assert "zfs shows a usage message when run as a user"
TEMPFILE="$TEST_BASE_DIR/zfs_001_neg.$$.txt"
eval "zfs > $TEMPFILE 2>&1"
zfs > $TEMPFILE 2>&1
log_must grep "usage: zfs command args" "$TEMPFILE"
log_must eval "awk '{if (length(\$0) > 80) exit 1}' < $TEMPFILE"