Fix some style nits in tests
Mostly whitespace changes, no functional changes intended. Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov> Reviewed-by: John Kennedy <john.kennedy@delphix.com> Signed-off-by: Ryan Moeller <ryan@iXsystems.com> Closes #9447
This commit is contained in:
parent
f1ba5478a3
commit
33cd5f2997
|
@ -62,7 +62,7 @@ log_assert "With ZFS_ABORT set, all zfs commands can abort and generate a " \
|
|||
"core file."
|
||||
log_onexit cleanup
|
||||
|
||||
#preparation work for testing
|
||||
# Preparation work for testing
|
||||
corepath=$TESTDIR/core
|
||||
if [[ -d $corepath ]]; then
|
||||
rm -rf $corepath
|
||||
|
|
|
@ -95,7 +95,6 @@ for arg in ${badargs[@]}; do
|
|||
log_mustnot eval "zfs unmount $arg $fs >/dev/null 2>&1"
|
||||
done
|
||||
|
||||
|
||||
# Testing invalid datasets
|
||||
for ds in $snap $vol "blah"; do
|
||||
for opt in "" "-f"; do
|
||||
|
|
|
@ -115,7 +115,7 @@ import_dir=$TEST_BASE_DIR/import_dir.$$
|
|||
log_must mkdir $import_dir
|
||||
log_must cp $STF_SUITE/tests/functional/history/zfs-pool-v4.dat.Z $import_dir
|
||||
log_must uncompress $import_dir/zfs-pool-v4.dat.Z
|
||||
upgrade_pool=$(zpool import -d $import_dir | grep "pool:" | awk '{print $2}')
|
||||
upgrade_pool=$(zpool import -d $import_dir | awk '/pool:/ { print $2 }')
|
||||
log_must zpool import -d $import_dir $upgrade_pool
|
||||
run_and_verify -p "$upgrade_pool" "zpool upgrade $upgrade_pool"
|
||||
|
||||
|
|
|
@ -110,7 +110,7 @@ function verify_long
|
|||
fi
|
||||
|
||||
typeset suffix=""
|
||||
if [ is_linux ]; then
|
||||
if is_linux; then
|
||||
suffix=":linux"
|
||||
fi
|
||||
|
||||
|
|
|
@ -401,18 +401,17 @@ set -A local_val "off" "on" "off" \
|
|||
#
|
||||
# Add system specific values
|
||||
#
|
||||
|
||||
if ! is_linux; then
|
||||
if is_linux; then
|
||||
prop+=("acltype" "")
|
||||
def_val+=("off")
|
||||
local_val+=("off")
|
||||
else
|
||||
prop+=("aclmode" "" \
|
||||
"mountpoint" "")
|
||||
def_val+=("discard" \
|
||||
"")
|
||||
local_val+=("groupmask" \
|
||||
"$TESTDIR")
|
||||
else
|
||||
prop+=("acltype" "")
|
||||
def_val+=("off")
|
||||
local_val+=("off")
|
||||
fi
|
||||
|
||||
|
||||
|
|
Loading…
Reference in New Issue