Skip to content

Commit

Permalink
Fix some style nits in tests
Browse files Browse the repository at this point in the history
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
  • Loading branch information
Ryan Moeller authored and tonyhutter committed Jan 22, 2020
1 parent f1ba547 commit 33cd5f2
Show file tree
Hide file tree
Showing 7 changed files with 15 additions and 17 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ function get_estimate_size
typeset snapshot=$1
typeset option=$2
typeset base_snapshot=${3:-""}
if [[ -z $3 ]];then
if [[ -z $3 ]]; then
typeset total_size=$(zfs send $option $snapshot 2>&1 | tail -1)
else
typeset total_size=$(zfs send $option $base_snapshot $snapshot \
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,15 +95,14 @@ for arg in ${badargs[@]}; do
log_mustnot eval "zfs unmount $arg $fs >/dev/null 2>&1"
done


#Testing invalid datasets
# Testing invalid datasets
for ds in $snap $vol "blah"; do
for opt in "" "-f"; do
log_mustnot eval "zfs unmount $opt $ds >/dev/null 2>&1"
done
done

#Testing invalid mountpoint
# Testing invalid mountpoint
dir=foodir.$$
file=foo.$$
fs1=$TESTPOOL/fs.$$
Expand All @@ -119,20 +118,20 @@ for mpt in "./$dir" "./$file" "/tmp"; do
done
cd $curpath

#Testing null argument and too many arguments
# Testing null argument and too many arguments
for opt in "" "-f"; do
log_mustnot eval "zfs unmount $opt >/dev/null 2>&1"
log_mustnot eval "zfs unmount $opt $fs $fs1 >/dev/null 2>&1"
done

#Testing already unmounted filesystem
# Testing already unmounted filesystem
log_must zfs unmount $fs1
for opt in "" "-f"; do
log_mustnot eval "zfs unmount $opt $fs1 >/dev/null 2>&1"
log_mustnot eval "zfs unmount /tmp/$dir >/dev/null 2>&1"
done

#Testing legacy mounted filesystem
# Testing legacy mounted filesystem
log_must zfs set mountpoint=legacy $fs1
if is_linux; then
log_must mount -t zfs $fs1 /tmp/$dir
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ function create_pool_test
typeset vdevs
eval "typeset -a diskarray=($3)"

for vdevs in "${diskarray[@]}";do
for vdevs in "${diskarray[@]}"; do
create_pool $pool $keywd $vdevs
log_must poolexists $pool
destroy_pool $pool
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ function verify_long
fi

typeset suffix=""
if [ is_linux ]; then
if is_linux; then
suffix=":linux"
fi

Expand Down
11 changes: 5 additions & 6 deletions tests/zfs-tests/tests/functional/inheritance/inherit_001_pos.ksh
Original file line number Diff line number Diff line change
Expand Up @@ -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


Expand Down

0 comments on commit 33cd5f2

Please sign in to comment.