Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix typos in tests/ #9249

Merged
merged 1 commit into from Sep 3, 2019
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
Expand Up @@ -157,7 +157,7 @@ verify_snapshots 1

snaps="1 2 3 4 5"
setup_snapshots
log_note "Snapshot destory with hold"
log_note "Snapshot destroy with hold"
range="1 2 3 4 5"
for i in 1 2 3 4 5; do
log_must zfs hold keep $TESTPOOL/$TESTFS1@snap$i
Expand Down
Expand Up @@ -30,7 +30,7 @@
# destroyed
# 3. Multiple clones with empty livelists
# - same as 1. but with multiple clones
# 4. Multuple clones with populated livelists
# 4. Multiple clones with populated livelists
# - same as 2. but with multiple clones

. $STF_SUITE/include/libtest.shlib
Expand Down
Expand Up @@ -56,7 +56,7 @@ function setup_testenv #[dtst]
if ! datasetexists $FS; then
log_must zfs create $FS
fi
# Volume test is only availible on globle zone
# Volume test is only available on global zone
if ! datasetexists $VOL && is_global_zone; then
log_must zfs create -V $VOLSIZE $VOL
block_device_wait
Expand Down Expand Up @@ -127,7 +127,7 @@ function check_dataset
shift

for dtst in "$@"; do
# Volume and related stuff are unvailable in local zone
# Volume and related stuff are unavailable in local zone
if ! is_global_zone; then
if [[ $dtst == $VOL || $dtst == $VOLSNAP || \
$dtst == $VOLCLONE ]]
Expand All @@ -140,7 +140,7 @@ function check_dataset

if (( ${#newlist} != 0 )); then
# Run each item in $newlist individually so on failure, the
# probelmatic dataset is listed in the logs.
# problematic dataset is listed in the logs.
for i in $newlist; do
log_must $funname $i
done
Expand Down
Expand Up @@ -61,7 +61,7 @@ log_must zfs snapshot $TESTPOOL2/$TESTFS@snap

log_must zfs clone $TESTPOOL2/$TESTFS@snap $TESTPOOL2/$TESTCLONE

# Create inital files and pause condense zthr on next execution
# Create initial files and pause condense zthr on next execution
log_must mkfile 10m /$TESTPOOL2/$TESTCLONE/A
log_must mkfile 1m /$TESTPOOL2/$TESTCLONE/B
log_must zpool sync $TESTPOOL2
Expand Down
Expand Up @@ -114,7 +114,7 @@ availspace=$(get_prop available $TESTPOOL)
typeset -i i=0

# make sure 'availspace' is larger then twice of FILESIZE to create a new pool.
# If any, we only totally create 3 pools for multple datasets testing to limit
# If any, we only totally create 3 pools for multiple datasets testing to limit
# testing time
while (( availspace > DFILESIZE )) && (( i < 3 )) ; do
(( i += 1 ))
Expand Down
Expand Up @@ -36,8 +36,8 @@
# 'zfs inherit' should return an error with bad parameters in one command.
#
# STRATEGY:
# 1. Set an array of bad options and invlid properties to 'zfs inherit'
# 2. Execute 'zfs inherit' with bad options and passing invlid properties
# 1. Set an array of bad options and invalid properties to 'zfs inherit'
# 2. Execute 'zfs inherit' with bad options and passing invalid properties
# 3. Verify an error is returned.
#

Expand Down
Expand Up @@ -37,8 +37,8 @@
# 'zfs inherit' should return an error with bad parameters in one command.
#
# STRATEGY:
# 1. Set an array of bad options and invlid properties to 'zfs inherit'
# 2. Execute 'zfs inherit' with bad options and passing invlid properties
# 1. Set an array of bad options and invalid properties to 'zfs inherit'
# 2. Execute 'zfs inherit' with bad options and passing invalid properties
# 3. Verify an error is returned.
#

Expand Down
Expand Up @@ -45,7 +45,7 @@
# setuid setuid/nosetuid
#
# STRATEGY:
# 1. Create filesystem and get origianl property value.
# 1. Create filesystem and get original property value.
# 2. Using 'zfs mount -o' to set filesystem property.
# 3. Verify the property was set temporarily.
# 4. Verify it will not affect the property that is stored on disk.
Expand Down
Expand Up @@ -83,7 +83,7 @@ log_must mkfile 1M $mntpnt/$TESTFILE2
log_mustnot ls $testfile
log_must ls $mntpnt/$TESTFILE1 $mntpnt/$TESTFILE2

# Verify $TESTFILE2 was created in $fs1, rather then $fs
# Verify $TESTFILE2 was created in $fs1, rather than $fs
log_must zfs unmount $fs1
log_must zfs set mountpoint=$mntpnt1 $fs1
log_must zfs mount $fs1
Expand Down
Expand Up @@ -72,4 +72,4 @@ else
fi
cd $curpath

log_pass "zfs mount fails with mounted filesystem or busy moutpoint as expected."
log_pass "zfs mount fails with mounted filesystem or busy mountpoint as expected."
Expand Up @@ -29,7 +29,7 @@

#
# DESCRIPTION:
# Verify remount functionality, expecially on readonly objects.
# Verify remount functionality, especially on readonly objects.
#
# STRATEGY:
# 1. Prepare a filesystem and a snapshot
Expand Down
Expand Up @@ -17,7 +17,7 @@
#
# DESCRIPTION
# Verify that "zfs list" gives correct values for written and written@
# proerties for the dataset when different operations are on done on it
# properties for the dataset when different operations are on done on it
#
#
# STRATEGY
Expand Down Expand Up @@ -86,7 +86,7 @@ blocks=0
for i in 1 2 3; do
written=$(get_prop written $TESTPOOL/$TESTFS1@snap$i)
if [[ $blocks -eq 0 ]]; then
# Written value for the frist non-clone snapshot is
# Written value for the first non-clone snapshot is
# expected to be equal to the referenced value.
expected_written=$( \
get_prop referenced $TESTPOOL/$TESTFS1@snap$i)
Expand Down Expand Up @@ -120,7 +120,7 @@ sync_pool
written=$(get_prop written $TESTPOOL/$TESTFS1)
writtenat3=$(get_prop written@snap3 $TESTPOOL/$TESTFS1)
[[ $written -eq $writtenat3 ]] || \
log_fail "Written and written@ dont match $written $writtenat3"
log_fail "Written and written@ don't match $written $writtenat3"
rlaager marked this conversation as resolved.
Show resolved Hide resolved
within_percent $written $before_written 0.1 && \
log_fail "Unexpected written value after delete $written $before_written"
writtenat=$(get_prop written@snap1 $TESTPOOL/$TESTFS1)
Expand Down
Expand Up @@ -155,7 +155,7 @@ for orig_fs in $datasets ; do

log_must zfs destroy -Rf $rst_fs

log_note "Verfiying 'zfs receive -d <filesystem>' works."
log_note "Verifying 'zfs receive -d <filesystem>' works."

i=0
while (( i < ${#bkup[*]} )); do
Expand Down
Expand Up @@ -36,7 +36,7 @@
# Verify 'zfs receive' fails with malformed parameters.
#
# STRATEGY:
# 1. Denfine malformed parameters array
# 1. Define malformed parameters array
# 2. Feed the malformed parameters to 'zfs receive'
# 3. Verify the command should be failed
#
Expand Down
Expand Up @@ -31,9 +31,9 @@
# 4. Snapshot the encrypted dataset
# 5. Attempt to receive the snapshot into an unencrypted child
# 6. Verify encryption is not enabled
# 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 the snapshot into an encrypted child
# 9. Verify the cheksum of the file is the same as the original
# 9. Verify the checksum of the file is the same as the original
#

verify_runnable "both"
Expand Down