aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib2
-rw-r--r--tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_005_pos.ksh6
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_016_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events_clear.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_001_neg.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_import/import_rewind_config_changed.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_active.ksh4
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_exported.ksh8
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_007_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_user/misc/setup.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_user/misc/zpool_online_001_neg.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_005_pos.ksh2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_user/zpool_status/zpool_status_003_pos.ksh2
15 files changed, 21 insertions, 21 deletions
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib b/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
index f80a2a864..94615ee3a 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
@@ -90,7 +90,7 @@ function find_mnttab_dev
}
#
-# Save the systme current dump device configuration
+# Save the system current dump device configuration
#
function save_dump_dev
{
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
index 9e6874832..3f3f44729 100644
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
@@ -146,7 +146,7 @@ function find_vfstab_dev
}
#
-# Save the systme current dump device configuration
+# Save the system current dump device configuration
#
function save_dump_dev
{
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_005_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_005_pos.ksh
index 2afbec37d..de5e9d8e7 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_005_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_005_pos.ksh
@@ -95,7 +95,7 @@ do
log_must zpool create $opt $TESTPOOL ${pooltype[i]} \
$file.1 $file.2 $file.3
! poolexists $TESTPOOL && \
- log_fail "Createing pool with $opt fails."
+ log_fail "Creating pool with $opt fails."
mpt=`zfs mount | egrep "^$TESTPOOL[^/]" | awk '{print $2}'`
(( ${#mpt} == 0 )) && \
log_fail "$TESTPOOL created with $opt is not mounted."
@@ -105,12 +105,12 @@ do
from the output of zfs mount"
if [[ "$opt" == "-m $TESTDIR1" ]]; then
[[ ! -d $TESTDIR1 ]] && \
- log_fail "$TESTDIR1 is not created auotmatically."
+ log_fail "$TESTDIR1 is not created automatically."
[[ "$mpt" != "$TESTDIR1" ]] && \
log_fail "$TESTPOOL is not mounted on $TESTDIR1."
elif [[ "$opt" == "-R $TESTDIR1" ]]; then
[[ ! -d $TESTDIR1/$TESTPOOL ]] && \
- log_fail "$TESTDIR1/$TESTPOOL is not created auotmatically."
+ log_fail "$TESTDIR1/$TESTPOOL is not created automatically."
[[ "$mpt" != "$TESTDIR1/$TESTPOOL" ]] && \
log_fail "$TESTPOOL is not mounted on $TESTDIR1/$TESTPOOL."
else
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_016_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_016_pos.ksh
index 3fca607b1..cbb5806d9 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_016_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_016_pos.ksh
@@ -41,7 +41,7 @@
# STRATEGY:
# 1. delete all devices in the swap
# 2. create a zpool
-# 3. Verify the creation is successed.
+# 3. Verify the creation was successful
#
verify_runnable "global"
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events_clear.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events_clear.ksh
index ab862354b..67038a474 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events_clear.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events_clear.ksh
@@ -34,7 +34,7 @@ log_assert "'zpool events -c' should successfully clear events."
# 1. Clear all ZFS events
# This is needed because we may already over the max number or events queued
# (zfs_zevent_len_max) generated by previous tests: generating $EVENTS_NUM new
-# events and then counting them is racy and leads to failues, so start from 0.
+# events and then counting them is racy and leads to failures, so start from 0.
log_must zpool events -c
# 2. Generate some new ZFS events
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_001_neg.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_001_neg.ksh
index dd1be14a0..a2b73182b 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_001_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_001_neg.ksh
@@ -38,7 +38,7 @@
#
# STRATEGY:
# 1. Create pool, volume & snap
-# 2. Verify 'zpool history' can cope with incorret arguments.
+# 2. Verify 'zpool history' can cope with incorrect arguments.
#
verify_runnable "global"
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_rewind_config_changed.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_rewind_config_changed.ksh
index e8f393760..f42ba10d6 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_rewind_config_changed.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/import_rewind_config_changed.ksh
@@ -115,7 +115,7 @@ function test_common
# further than the time that we took the checkpoint.
#
# Note that, ideally we would want to take a checkpoint
- # right after we recond the txg we plan to rewind to.
+ # right after we record the txg we plan to rewind to.
# But since we can't attach, detach or remove devices
# while having a checkpoint, we take it after the
# operation that changes the config.
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh
index 7534ebca8..c6d263707 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh
@@ -54,7 +54,7 @@
# 3. Export the test pool.
# 4. Move one or more device files to other directory
# 5. Verify 'zpool import -d' with the new directory
-# will handle moved files successfullly.
+# will handle moved files successfully.
# Using the various combinations.
# - Regular import
# - Alternate Root Specified
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_active.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_active.ksh
index dcca2e933..b63d55d7a 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_active.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_active.ksh
@@ -24,8 +24,8 @@
# STRATEGY:
# 1. Create the pool with log device.
# 2. Try clearing the label on data and log devices.
-# 3. Add auxilary (cache/spare) vdevs.
-# 4. Try clearing the label on auxilary vdevs.
+# 3. Add auxiliary (cache/spare) vdevs.
+# 4. Try clearing the label on auxiliary vdevs.
# 5. Check that zpool labelclear will return non-zero and
# labels are intact.
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_exported.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_exported.ksh
index a5131bdbb..72a555beb 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_exported.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_exported.ksh
@@ -26,8 +26,8 @@
# 2. Export the pool.
# 3. Check that zpool labelclear returns non-zero when trying to
# clear the label on ACTIVE vdevs, and succeeds with -f.
-# 4. Add auxilary vdevs (cache/spare).
-# 5. Check that zpool labelclear succeeds on auxilary vdevs of
+# 4. Add auxiliary vdevs (cache/spare).
+# 5. Check that zpool labelclear succeeds on auxiliary vdevs of
# exported pool.
verify_runnable "global"
@@ -44,7 +44,7 @@ log_assert "zpool labelclear will fail on ACTIVE vdevs of exported pool and" \
for vdevtype in "" "cache" "spare"; do
# Create simple pool, skip any mounts
log_must zpool create -O mountpoint=none -f $TESTPOOL $disk1 log $disk2
- # Add auxilary vdevs (cache/spare)
+ # Add auxiliary vdevs (cache/spare)
if [[ -n $vdevtype ]]; then
log_must zpool add $TESTPOOL $vdevtype $disk3
fi
@@ -63,7 +63,7 @@ for vdevtype in "" "cache" "spare"; do
log_must zpool labelclear -f $disk2
log_mustnot zdb -lq $disk2
- # Check that labelclear on auxilary vdevs will succeed
+ # Check that labelclear on auxiliary vdevs will succeed
if [[ -n $vdevtype ]]; then
log_must zpool labelclear $disk3
log_mustnot zdb -lq $disk3
diff --git a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_007_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_007_pos.ksh
index adc1ba47f..696c8c66c 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_007_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_007_pos.ksh
@@ -42,7 +42,7 @@
#
# STRATEGY:
# 1. Import pools of all versions
-# 2. Setup a test enviorment over the old pools.
+# 2. Setup a test environment over the old pools.
# 3. Verify the commands related to 'zfs upgrade' succeed as expected.
#
diff --git a/tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh b/tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
index bcf6a2296..fc0ebde10 100755
--- a/tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
+++ b/tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
@@ -34,7 +34,7 @@
# This setup script is moderately complex, as it creates scenarios for all
# of the tests included in this directory. Usually we'd want each test case
-# to setup/teardown it's own configuration, but this would be time consuming
+# to setup/teardown its own configuration, but this would be time consuming
# given the nature of these tests. However, as a side-effect, one test
# leaving the system in an unknown state could impact other test cases.
diff --git a/tests/zfs-tests/tests/functional/cli_user/misc/zpool_online_001_neg.ksh b/tests/zfs-tests/tests/functional/cli_user/misc/zpool_online_001_neg.ksh
index b89cf07ac..cd2905153 100755
--- a/tests/zfs-tests/tests/functional/cli_user/misc/zpool_online_001_neg.ksh
+++ b/tests/zfs-tests/tests/functional/cli_user/misc/zpool_online_001_neg.ksh
@@ -49,7 +49,7 @@ function check_for_online
| grep ONLINE )
if [ -n "$RESULT" ]
then
- log_fail "A disk was brough online!"
+ log_fail "A disk was brought online!"
fi
}
diff --git a/tests/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_005_pos.ksh b/tests/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_005_pos.ksh
index 1ae91c1a8..53652ec11 100755
--- a/tests/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_005_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_005_pos.ksh
@@ -68,7 +68,7 @@ for i in $files ; do
test_zpool_script "$i" "$testpool" "zpool iostat -Pv -c"
done
-# Test that we can run multiple scripts separated with a commma by running
+# Test that we can run multiple scripts separated with a comma by running
# all the scripts in a single -c line.
allscripts="$(echo $scripts | sed -r 's/[[:blank:]]+/,/g')"
test_zpool_script "$allscripts" "$testpool" "zpool iostat -Pv -c"
diff --git a/tests/zfs-tests/tests/functional/cli_user/zpool_status/zpool_status_003_pos.ksh b/tests/zfs-tests/tests/functional/cli_user/zpool_status/zpool_status_003_pos.ksh
index c5e0c6e47..fa7d3f3f2 100755
--- a/tests/zfs-tests/tests/functional/cli_user/zpool_status/zpool_status_003_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_user/zpool_status/zpool_status_003_pos.ksh
@@ -68,7 +68,7 @@ for i in $files ; do
test_zpool_script "$i" "$testpool" "zpool status -P -c"
done
-# Test that we can run multiple scripts separated with a commma by running
+# Test that we can run multiple scripts separated with a comma by running
# all the scripts in a single -c line.
allscripts="$(echo $scripts | sed -r 's/[[:blank:]]+/,/g')"
test_zpool_script "$allscripts" "$testpool" "zpool status -P -c"