aboutsummaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
authorRichard Laager <[email protected]>2019-04-14 21:06:34 -0500
committerBrian Behlendorf <[email protected]>2019-04-14 19:06:34 -0700
commit83472fabe5600695fdb07a3f158a9352cc5bf3af (patch)
treeab940e40b76709b3d7e59fef85aab853f3474730 /tests
parent703f791d3538472600571ecde01627df6b47e6d6 (diff)
Fix hierarchy misspellings
Reviewed-by: George Melikov <[email protected]> Reviewed-by: Brian Behlendorf <[email protected]> Reported-by: Matthew Ahrens <[email protected]> Signed-off-by: Richard Laager <[email protected]> Closes #8563 Closes #8622
Diffstat (limited to 'tests')
-rw-r--r--tests/runfiles/linux.run2
-rwxr-xr-xtests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh2
-rw-r--r--tests/zfs-tests/tests/functional/rsend/Makefile.am2
-rwxr-xr-xtests/zfs-tests/tests/functional/rsend/send_encrypted_hierarchy.ksh (renamed from tests/zfs-tests/tests/functional/rsend/send_encrypted_heirarchy.ksh)4
4 files changed, 5 insertions, 5 deletions
diff --git a/tests/runfiles/linux.run b/tests/runfiles/linux.run
index f57572dc2..f01a36da8 100644
--- a/tests/runfiles/linux.run
+++ b/tests/runfiles/linux.run
@@ -803,7 +803,7 @@ tests = ['rsend_001_pos', 'rsend_002_pos', 'rsend_003_pos', 'rsend_004_pos',
'send-c_lz4_disabled', 'send-c_recv_lz4_disabled',
'send-c_mixed_compression', 'send-c_stream_size_estimate', 'send-cD',
'send-c_embedded_blocks', 'send-c_resume', 'send-cpL_varied_recsize',
- 'send-c_recv_dedup', 'send_encrypted_files', 'send_encrypted_heirarchy',
+ 'send-c_recv_dedup', 'send_encrypted_files', 'send_encrypted_hierarchy',
'send_encrypted_props', 'send_freeobjects', 'send_realloc_dnode_size',
'send_realloc_files', 'send_holds', 'send_hole_birth', 'send_mixed_raw',
'send-wDR_encrypted_zvol']
diff --git a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
index 3c909e458..04e971312 100755
--- a/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
+++ b/tests/zfs-tests/tests/functional/cli_root/zfs_destroy/zfs_destroy_003_pos.ksh
@@ -135,7 +135,7 @@ for obj in $child_fs $child_fs1 $ctr $ctr1; do
log_mustnot zfs destroy -r $obj
datasetexists $obj || \
log_fail "'zfs destroy -r' fails to keep dependent " \
- "clone outside the hirearchy."
+ "clone outside the hierarchy."
done
diff --git a/tests/zfs-tests/tests/functional/rsend/Makefile.am b/tests/zfs-tests/tests/functional/rsend/Makefile.am
index 22cafd19f..24d4d61cd 100644
--- a/tests/zfs-tests/tests/functional/rsend/Makefile.am
+++ b/tests/zfs-tests/tests/functional/rsend/Makefile.am
@@ -22,7 +22,7 @@ dist_pkgdata_SCRIPTS = \
rsend_022_pos.ksh \
rsend_024_pos.ksh \
send_encrypted_files.ksh \
- send_encrypted_heirarchy.ksh \
+ send_encrypted_hierarchy.ksh \
send_encrypted_props.ksh \
send-cD.ksh \
send-c_embedded_blocks.ksh \
diff --git a/tests/zfs-tests/tests/functional/rsend/send_encrypted_heirarchy.ksh b/tests/zfs-tests/tests/functional/rsend/send_encrypted_hierarchy.ksh
index 5e19a6b6c..8417afc88 100755
--- a/tests/zfs-tests/tests/functional/rsend/send_encrypted_heirarchy.ksh
+++ b/tests/zfs-tests/tests/functional/rsend/send_encrypted_hierarchy.ksh
@@ -46,7 +46,7 @@ function cleanup
log_assert "Raw recursive sends preserve filesystem structure."
log_onexit cleanup
-# Create the filesystem heirarchy
+# Create the filesystem hierarchy
log_must cleanup_pool $POOL
log_must eval "echo $PASSPHRASE | zfs create -o encryption=on" \
"-o keyformat=passphrase $POOL/$FS"
@@ -72,7 +72,7 @@ log_must verify_origin $POOL/clone "$POOL/$FS@snap"
log_must verify_encryption_root $POOL/$FS/child $POOL/$FS
log_must verify_keylocation $POOL/$FS/child "none"
-# Alter the heirarchy and re-send
+# Alter the hierarchy and re-send
log_must eval "echo $PASSPHRASE1 | zfs change-key -o keyformat=passphrase" \
"$POOL/$FS/child"
log_must zfs promote $POOL/clone