Skip to content

Commit

Permalink
Fix typos in tests/
Browse files Browse the repository at this point in the history
Thanks a lot for patch review to
@freqlabs and @behlendorf

Signed-off-by: Andrea Gelmini <[email protected]>
  • Loading branch information
Gelma committed Aug 31, 2019
1 parent e6203d2 commit dbb9184
Show file tree
Hide file tree
Showing 15 changed files with 21 additions and 21 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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."
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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
Expand All @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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.
#

Expand Down
2 changes: 1 addition & 1 deletion tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
Original file line number Diff line number Diff line change
Expand Up @@ -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.

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down

0 comments on commit dbb9184

Please sign in to comment.