c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2025-01-13 19:50:25 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix some style nits in tests

Browse Source 
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:
Ryan Moeller 2019-10-11 12:49:48 -04:00 committed by Tony Hutter
parent f1ba5478a3
commit 33cd5f2997
7 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/zfs-tests/tests/functional/cli_root/zfs/zfs_002_pos.ksh
View File

@ -62,7 +62,7 @@ log_assert "With ZFS_ABORT set, all zfs commands can abort and generate a " \
"core file." "core file."
log_onexit cleanup log_onexit cleanup
#preparation work for testing # Preparation work for testing
corepath=$TESTDIR/core corepath=$TESTDIR/core
if [[ -d $corepath ]]; then if [[ -d $corepath ]]; then
rm -rf $corepath rm -rf $corepath

1
tests/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_008_neg.ksh
View File

@ -95,7 +95,6 @@ for arg in ${badargs[@]}; do
log_mustnot eval "zfs unmount $arg $fs >/dev/null 2>&1" log_mustnot eval "zfs unmount $arg $fs >/dev/null 2>&1"
done done
# Testing invalid datasets # Testing invalid datasets
for ds in $snap $vol "blah"; do for ds in $snap $vol "blah"; do
for opt in "" "-f"; do for opt in "" "-f"; do

2
tests/zfs-tests/tests/functional/history/history_001_pos.ksh
View File

@ -115,7 +115,7 @@ import_dir=$TEST_BASE_DIR/import_dir.$$
log_must mkdir $import_dir log_must mkdir $import_dir
log_must cp $STF_SUITE/tests/functional/history/zfs-pool-v4.dat.Z $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 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 log_must zpool import -d $import_dir $upgrade_pool
run_and_verify -p "$upgrade_pool" "zpool upgrade $upgrade_pool" run_and_verify -p "$upgrade_pool" "zpool upgrade $upgrade_pool"

2
tests/zfs-tests/tests/functional/history/history_common.kshlib
View File

@ -110,7 +110,7 @@ function verify_long
fi fi
typeset suffix="" typeset suffix=""
if [ is_linux ]; then if is_linux; then
suffix=":linux" suffix=":linux"
fi fi

11
tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh
View File

@ -401,18 +401,17 @@ set -A local_val "off" "on" "off" \
# #
# Add system specific values # Add system specific values
# #
if is_linux; then
if ! is_linux; then prop+=("acltype" "")
def_val+=("off")
local_val+=("off")
else
prop+=("aclmode" "" \ prop+=("aclmode" "" \
"mountpoint" "") "mountpoint" "")
def_val+=("discard" \ def_val+=("discard" \
"") "")
local_val+=("groupmask" \ local_val+=("groupmask" \
"$TESTDIR") "$TESTDIR")
else
prop+=("acltype" "")
def_val+=("off")
local_val+=("off")
fi fi