summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw.ksh4
-rw-r--r--tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_004_neg.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_set/canmount_002_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_002_pos.ksh2
-rw-r--r--tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib4
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_008_neg.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh4
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh4
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_001_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_004_neg.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh2
15 files changed, 19 insertions, 19 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw.ksh
index 2042b37a9..e2e2c5f01 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_receive/zfs_receive_raw.ksh
@@ -31,11 +31,11 @@
# 4. Attempt to receive a raw send stream as a child of an unencrypted dataset
# 5. Verify the key is unavailable
# 6. Attempt to load the key and mount the dataset
-# 7. Verify the cheksum of the file is the same as the original
+# 7. Verify the checksum of the file is the same as the original
# 8. Attempt to receive a raw send stream as a child of an encrypted dataset
# 9. Verify the key is unavailable
# 10. Attempt to load the key and mount the dataset
-# 11. Verify the cheksum of the file is the same as the original
+# 11. Verify the checksum of the file is the same as the original
#
verify_runnable "both"
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib b/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib
index 5b157d11c..f69ec300c 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_rollback/zfs_rollback_common.kshlib
@@ -147,7 +147,7 @@ function setup_clone_env
}
#
-# Clean up the test environmnet
+# Clean up the test environment
#
# $1 number of snapshot Note: Currently only support three snapshots.
#
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_004_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_004_neg.ksh
index da14fa2fa..4a9d29fce 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_004_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_send/zfs_send_004_neg.ksh
@@ -65,7 +65,7 @@ snap2=$fs@snap2
snap3=$fs@snap3
set -A badargs \
- "" "$TESTPOOL" "$TESTFS" "$fs" "$fs@nonexisten_snap" "?" \
+ "" "$TESTPOOL" "$TESTFS" "$fs" "$fs@nonexistent_snap" "?" \
"$snap1/blah" "$snap1@blah" "-i" "-x" "-i $fs" \
"-x $snap1 $snap2" "-i $snap1" \
"-i $snap2 $snap1" "$snap1 $snap2" "-i $snap1 $snap2 $snap3" \
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh
index 5fbc8bf71..caad211bc 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_set/cache_002_neg.ksh
@@ -64,4 +64,4 @@ do
done
done
-log_pass "Setting invalid {primary|secondary}cache on fs or volume fail as expeced."
+log_pass "Setting invalid {primary|secondary}cache on fs or volume fail as expected."
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_set/canmount_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_set/canmount_002_pos.ksh
index 7cbcf7903..3b8b88e36 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_set/canmount_002_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_set/canmount_002_pos.ksh
@@ -40,7 +40,7 @@
#
# STRATEGY:
# 1. Setup a pool and create fs, volume, snapshot clone within it.
-# 2. Set canmount=noauto for each dataset and check the retuen value
+# 2. Set canmount=noauto for each dataset and check the return value
# and check if it still can be mounted by mount -a.
# 3. mount each dataset(except volume) to see if it can be mounted.
#
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_002_pos.ksh
index ad33e18fb..48580cafd 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_002_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_set/mountpoint_002_pos.ksh
@@ -34,7 +34,7 @@
#
# DESCRIPTION:
-# If ZFS is currently managing the file system but it is currently unmoutned,
+# If ZFS is currently managing the file system but it is currently unmounted,
# and the mountpoint property is changed, the file system remains unmounted.
#
# STRATEGY:
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib b/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
index 084a4a0a8..5e9f719df 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_set/zfs_set_common.kshlib
@@ -156,7 +156,7 @@ function random_string
}
#
-# Get vaild user defined property name
+# Get valid user defined property name
#
# $1 user defined property name length
#
@@ -189,7 +189,7 @@ function valid_user_property
}
#
-# Get invaild user defined property name
+# Get invalid user defined property name
#
# $1 user defined property name length
#
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh
index 2efcf1cce..5d8b6e275 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_002_neg.ksh
@@ -82,7 +82,7 @@ while (( i < ${#args[*]} )); do
((i = i + 1))
done
-# Testing the invalid senario: the child volume already has an
+# Testing the invalid scenario: the child volume already has an
# identical name snapshot, zfs snapshot -r should fail when
# creating snapshot with -r for the parent
log_must zfs destroy $TESTPOOL/$TESTCTR/$TESTFS1@$TESTSNAP
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_008_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_008_neg.ksh
index 377910013..627910abd 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_008_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_008_neg.ksh
@@ -34,7 +34,7 @@
# STRATEGY:
# 1. Create 2 separate zpools, zpool name lengths must be the same.
# 2. Attempt to simultaneously create a snapshot of each pool.
-# 3. Veriy the snapshot creation failed.
+# 3. Verify the snapshot creation failed.
#
verify_runnable "both"
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh
index 4cd98af0c..f0682b816 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_snapshot/zfs_snapshot_009_pos.ksh
@@ -22,7 +22,7 @@
# 1. Create multiple datasets
# 2. Create multiple snapshots with a list of valid and invalid
# snapshot names
-# 3. Verify the valid snpashot creation
+# 3. Verify the valid snapshot creation
. $STF_SUITE/include/libtest.shlib
@@ -86,7 +86,7 @@ for i in 1 2 3; do
txg_tag=$(echo "$txg_group" | nawk -v j=$i 'FNR == j {print}')
[[ $txg_tag != $(echo "$txg_group" | \
nawk -v j=$i 'FNR == j {print}') ]] \
- && log_fail "snapshots belong to differnt transaction groups"
+ && log_fail "snapshots belong to different transaction groups"
done
log_note "verify snapshot contents"
for ds in $datasets; do
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh
index 0ed14a99f..3575875c2 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_unmount/zfs_unmount_009_pos.ksh
@@ -83,7 +83,7 @@ function restore_dataset
}
-log_assert "zfs fource unmount and destroy in snapshot directory will not cause error."
+log_assert "zfs force unmount and destroy in snapshot directory will not cause error."
log_onexit cleanup
for fs in $TESTPOOL/$TESTFS $TESTPOOL ; do
@@ -139,4 +139,4 @@ log_must eval zpool list > /dev/null 2>&1
log_must eval zpool status > /dev/null 2>&1
zpool iostat > /dev/null 2>&1
-log_pass "zfs fource unmount and destroy in snapshot directory will not cause error."
+log_pass "zfs force unmount and destroy in snapshot directory will not cause error."
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_001_pos.ksh
index 7bb1cd4a3..ca625bd22 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_001_pos.ksh
@@ -140,7 +140,7 @@ while (( i < ${#mntp_fs[*]} )); do
((i = i + 2))
done
-log_note "Verify 'zfs unshare -a' succeds as root."
+log_note "Verify 'zfs unshare -a' succeeds as root."
i=0
typeset sharenfs_val
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_004_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_004_neg.ksh
index e92581c7c..fd916040b 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_004_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_unshare/zfs_unshare_004_neg.ksh
@@ -46,7 +46,7 @@ verify_runnable "global"
export NONEXISTFSNAME="nonexistfs50charslong_0123456789012345678901234567"
export NONEXISTMOUNTPOINT="/nonexistmountpoint_0123456789"
-set -A opts "" "$TESTPOOL/$NONEXISTFSNAME" "$NONEEXISTMOUNTPOINT" "-?" "-1" \
+set -A opts "" "$TESTPOOL/$NONEXISTFSNAME" "$NONEXISTMOUNTPOINT" "-?" "-1" \
"-a blah" "$TESTPOOL/$TESTFS $TESTPOOL/$TESTFS1" \
"-f $TESTPOOL/$TESTFS $TESTPOOL/$TESTFS1" \
"$TESTPOOL/$TESTFS $TESTDIR" "-f $TESTPOOL/$TESTFS $TESTDIR" \
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh
index e37b4f81a..d3ed4a736 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_upgrade/zfs_upgrade_001_pos.ksh
@@ -133,7 +133,7 @@ COUNT=$( wc -l $output | awk '{print $1}' )
if (( COUNT != OLDCOUNT )); then
cat $output
- log_fail "Unexpect old-version filesystems print out."
+ log_fail "Unexpected old-version filesystems print out."
fi
log_pass "Executing 'zfs upgrade' command succeeds."
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh
index a3158bd57..25decd788 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool/zpool_001_neg.ksh
@@ -37,7 +37,7 @@
# return an error.
#
# STRATEGY:
-# 1. Create an array containg each zpool sub-command name.
+# 1. Create an array containing each zpool sub-command name.
# 2. For each element, execute the sub-command.
# 3. Verify it returns an error.
#