c/mirror_zfs
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_zfs.git synced 2024-11-18 10:21:01 +03:00
Code Issues Packages Projects Releases Wiki Activity

Fix typos in tests/

Browse Source 
Reviewed-by: Ryan Moeller <ryan@ixsystems.com>
Reviewed-by: Richard Laager <rlaager@wiktel.com>
Reviewed-by: Brian Behlendorf <behlendorf1@llnl.gov>
Signed-off-by: Andrea Gelmini <andrea.gelmini@gelma.net>
Closes #9247
This commit is contained in:
Andrea Gelmini 2019-09-03 03:12:01 +02:00 committed by Tony Hutter
parent 7a7da11671
commit 36be89b8e5
15 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/zfs-tests/tests/functional/cli_root/zpool_add/zpool_add.kshlib
View File

@ -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 function save_dump_dev
{ {

2
tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create.shlib
View File

@ -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 function save_dump_dev
{ {

6
tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_005_pos.ksh
View File

@ -95,7 +95,7 @@ do
log_must zpool create $opt $TESTPOOL ${pooltype[i]} \ log_must zpool create $opt $TESTPOOL ${pooltype[i]} \
$file.1 $file.2 $file.3 $file.1 $file.2 $file.3
! poolexists $TESTPOOL && \ ! 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=`zfs mount | egrep "^$TESTPOOL[^/]" | awk '{print $2}'`
(( ${#mpt} == 0 )) && \ (( ${#mpt} == 0 )) && \
log_fail "$TESTPOOL created with $opt is not mounted." log_fail "$TESTPOOL created with $opt is not mounted."
@ -105,12 +105,12 @@ do
from the output of zfs mount" from the output of zfs mount"
if [[ "$opt" == "-m $TESTDIR1" ]]; then if [[ "$opt" == "-m $TESTDIR1" ]]; then
[[ ! -d $TESTDIR1 ]] && \ [[ ! -d $TESTDIR1 ]] && \
log_fail "$TESTDIR1 is not created auotmatically." log_fail "$TESTDIR1 is not created automatically."
[[ "$mpt" != "$TESTDIR1" ]] && \ [[ "$mpt" != "$TESTDIR1" ]] && \
log_fail "$TESTPOOL is not mounted on $TESTDIR1." log_fail "$TESTPOOL is not mounted on $TESTDIR1."
elif [[ "$opt" == "-R $TESTDIR1" ]]; then elif [[ "$opt" == "-R $TESTDIR1" ]]; then
[[ ! -d $TESTDIR1/$TESTPOOL ]] && \ [[ ! -d $TESTDIR1/$TESTPOOL ]] && \
log_fail "$TESTDIR1/$TESTPOOL is not created auotmatically." log_fail "$TESTDIR1/$TESTPOOL is not created automatically."
[[ "$mpt" != "$TESTDIR1/$TESTPOOL" ]] && \ [[ "$mpt" != "$TESTDIR1/$TESTPOOL" ]] && \
log_fail "$TESTPOOL is not mounted on $TESTDIR1/$TESTPOOL." log_fail "$TESTPOOL is not mounted on $TESTDIR1/$TESTPOOL."
else else

2
tests/zfs-tests/tests/functional/cli_root/zpool_create/zpool_create_016_pos.ksh
View File

@ -41,7 +41,7 @@
# STRATEGY: # STRATEGY:
# 1. delete all devices in the swap # 1. delete all devices in the swap
# 2. create a zpool # 2. create a zpool
# 3. Verify the creation is successed. # 3. Verify the creation was successful
# #
verify_runnable "global" verify_runnable "global"

2
tests/zfs-tests/tests/functional/cli_root/zpool_events/zpool_events_clear.ksh
View File

@ -34,7 +34,7 @@ log_assert "'zpool events -c' should successfully clear events."
# 1. Clear all ZFS events # 1. Clear all ZFS events
# This is needed because we may already over the max number or events queued # 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 # (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 log_must zpool events -c
# 2. Generate some new ZFS events # 2. Generate some new ZFS events

2
tests/zfs-tests/tests/functional/cli_root/zpool_history/zpool_history_001_neg.ksh
View File

@ -38,7 +38,7 @@
# #
# STRATEGY: # STRATEGY:
# 1. Create pool, volume & snap # 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" verify_runnable "global"

2
tests/zfs-tests/tests/functional/cli_root/zpool_import/import_rewind_config_changed.ksh
View File

@ -115,7 +115,7 @@ function test_common
# further than the time that we took the checkpoint. # further than the time that we took the checkpoint.
# #
# Note that, ideally we would want to take a 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 # But since we can't attach, detach or remove devices
# while having a checkpoint, we take it after the # while having a checkpoint, we take it after the
# operation that changes the config. # operation that changes the config.

2
tests/zfs-tests/tests/functional/cli_root/zpool_import/zpool_import_missing_002_pos.ksh
View File

@ -54,7 +54,7 @@
# 3. Export the test pool. # 3. Export the test pool.
# 4. Move one or more device files to other directory # 4. Move one or more device files to other directory
# 5. Verify 'zpool import -d' with the new directory # 5. Verify 'zpool import -d' with the new directory
# will handle moved files successfullly. # will handle moved files successfully.
# Using the various combinations. # Using the various combinations.
# - Regular import # - Regular import
# - Alternate Root Specified # - Alternate Root Specified

4
tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_active.ksh
View File

@ -24,8 +24,8 @@
# STRATEGY: # STRATEGY:
# 1. Create the pool with log device. # 1. Create the pool with log device.
# 2. Try clearing the label on data and log devices. # 2. Try clearing the label on data and log devices.
# 3. Add auxilary (cache/spare) vdevs. # 3. Add auxiliary (cache/spare) vdevs.
# 4. Try clearing the label on auxilary vdevs. # 4. Try clearing the label on auxiliary vdevs.
# 5. Check that zpool labelclear will return non-zero and # 5. Check that zpool labelclear will return non-zero and
# labels are intact. # labels are intact.

8
tests/zfs-tests/tests/functional/cli_root/zpool_labelclear/zpool_labelclear_exported.ksh
View File

@ -26,8 +26,8 @@
# 2. Export the pool. # 2. Export the pool.
# 3. Check that zpool labelclear returns non-zero when trying to # 3. Check that zpool labelclear returns non-zero when trying to
# clear the label on ACTIVE vdevs, and succeeds with -f. # clear the label on ACTIVE vdevs, and succeeds with -f.
# 4. Add auxilary vdevs (cache/spare). # 4. Add auxiliary vdevs (cache/spare).
# 5. Check that zpool labelclear succeeds on auxilary vdevs of # 5. Check that zpool labelclear succeeds on auxiliary vdevs of
# exported pool. # exported pool.
verify_runnable "global" 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 for vdevtype in "" "cache" "spare"; do
# Create simple pool, skip any mounts # Create simple pool, skip any mounts
log_must zpool create -O mountpoint=none -f $TESTPOOL $disk1 log $disk2 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 if [[ -n $vdevtype ]]; then
log_must zpool add $TESTPOOL $vdevtype $disk3 log_must zpool add $TESTPOOL $vdevtype $disk3
fi fi
@ -63,7 +63,7 @@ for vdevtype in "" "cache" "spare"; do
log_must zpool labelclear -f $disk2 log_must zpool labelclear -f $disk2
log_mustnot zdb -lq $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 if [[ -n $vdevtype ]]; then
log_must zpool labelclear $disk3 log_must zpool labelclear $disk3
log_mustnot zdb -lq $disk3 log_mustnot zdb -lq $disk3

2
tests/zfs-tests/tests/functional/cli_root/zpool_upgrade/zpool_upgrade_007_pos.ksh
View File

@ -42,7 +42,7 @@
# #
# STRATEGY: # STRATEGY:
# 1. Import pools of all versions # 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. # 3. Verify the commands related to 'zfs upgrade' succeed as expected.
# #

2
tests/zfs-tests/tests/functional/cli_user/misc/setup.ksh
View File

@ -34,7 +34,7 @@
# This setup script is moderately complex, as it creates scenarios for all # 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 # 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 # 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. # leaving the system in an unknown state could impact other test cases.

2
tests/zfs-tests/tests/functional/cli_user/misc/zpool_online_001_neg.ksh
View File

@ -49,7 +49,7 @@ function check_for_online
| grep ONLINE ) | grep ONLINE )
if [ -n "$RESULT" ] if [ -n "$RESULT" ]
then then
log_fail "A disk was brough online!" log_fail "A disk was brought online!"
fi fi
} }

2
tests/zfs-tests/tests/functional/cli_user/zpool_iostat/zpool_iostat_005_pos.ksh
View File

@ -68,7 +68,7 @@ for i in $files ; do
test_zpool_script "$i" "$testpool" "zpool iostat -Pv -c" test_zpool_script "$i" "$testpool" "zpool iostat -Pv -c"
done 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. # all the scripts in a single -c line.
allscripts="$(echo $scripts | sed -r 's/[[:blank:]]+/,/g')" allscripts="$(echo $scripts | sed -r 's/[[:blank:]]+/,/g')"
test_zpool_script "$allscripts" "$testpool" "zpool iostat -Pv -c" test_zpool_script "$allscripts" "$testpool" "zpool iostat -Pv -c"

2
tests/zfs-tests/tests/functional/cli_user/zpool_status/zpool_status_003_pos.ksh
View File

@ -68,7 +68,7 @@ for i in $files ; do
test_zpool_script "$i" "$testpool" "zpool status -P -c" test_zpool_script "$i" "$testpool" "zpool status -P -c"
done 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. # all the scripts in a single -c line.
allscripts="$(echo $scripts | sed -r 's/[[:blank:]]+/,/g')" allscripts="$(echo $scripts | sed -r 's/[[:blank:]]+/,/g')"
test_zpool_script "$allscripts" "$testpool" "zpool status -P -c" test_zpool_script "$allscripts" "$testpool" "zpool status -P -c"