From 6f56f61b3c12a031e709aa6a35cdb47d4f2cf4c7 Mon Sep 17 00:00:00 2001
From: Nicolas Joly <njoly@pasteur.fr>
Date: Fri, 5 Jun 2015 08:26:44 -0700
Subject: [PATCH] Spelling fixes in testsuite.

---
 testsuite/expect/README         |  2 +-
 testsuite/expect/globals        |  6 +++---
 testsuite/expect/test1.10       |  2 +-
 testsuite/expect/test1.14       |  2 +-
 testsuite/expect/test1.20       |  4 ++--
 testsuite/expect/test1.24       |  2 +-
 testsuite/expect/test1.35       |  2 +-
 testsuite/expect/test1.53       |  2 +-
 testsuite/expect/test1.64       |  2 +-
 testsuite/expect/test1.67       |  2 +-
 testsuite/expect/test1.68       |  4 ++--
 testsuite/expect/test1.69       |  2 +-
 testsuite/expect/test1.71       |  2 +-
 testsuite/expect/test1.73       |  2 +-
 testsuite/expect/test1.74       |  8 ++++----
 testsuite/expect/test1.83       |  2 +-
 testsuite/expect/test1.87       |  2 +-
 testsuite/expect/test1.89       |  4 ++--
 testsuite/expect/test1.90       |  4 ++--
 testsuite/expect/test1.93       |  2 +-
 testsuite/expect/test1.97       |  4 ++--
 testsuite/expect/test1.99       |  2 +-
 testsuite/expect/test11.1       |  2 +-
 testsuite/expect/test11.2       |  2 +-
 testsuite/expect/test11.3       |  2 +-
 testsuite/expect/test11.4       |  2 +-
 testsuite/expect/test11.6       |  2 +-
 testsuite/expect/test11.7       |  2 +-
 testsuite/expect/test12.2       |  2 +-
 testsuite/expect/test12.4       |  2 +-
 testsuite/expect/test13.1       |  2 +-
 testsuite/expect/test13.2       |  2 +-
 testsuite/expect/test14.4       |  2 +-
 testsuite/expect/test15.10      |  2 +-
 testsuite/expect/test15.11      |  4 ++--
 testsuite/expect/test15.12      |  2 +-
 testsuite/expect/test15.19      |  2 +-
 testsuite/expect/test15.26      |  2 +-
 testsuite/expect/test15.9       |  2 +-
 testsuite/expect/test17.12      |  2 +-
 testsuite/expect/test17.18      |  2 +-
 testsuite/expect/test17.23      |  2 +-
 testsuite/expect/test17.34      |  4 ++--
 testsuite/expect/test17.36      |  2 +-
 testsuite/expect/test17.5       |  2 +-
 testsuite/expect/test17.6       |  2 +-
 testsuite/expect/test2.13       |  4 ++--
 testsuite/expect/test2.5        |  2 +-
 testsuite/expect/test21.20      | 18 +++++++++---------
 testsuite/expect/test21.30      |  2 +-
 testsuite/expect/test21.7       |  2 +-
 testsuite/expect/test28.2       |  2 +-
 testsuite/expect/test28.5       |  2 +-
 testsuite/expect/test28.7       |  4 ++--
 testsuite/expect/test3.5        |  2 +-
 testsuite/expect/test3.6        |  2 +-
 testsuite/expect/test3.7.prog.c |  2 +-
 testsuite/expect/test32.2       |  2 +-
 testsuite/expect/test32.9       |  2 +-
 testsuite/expect/test33.1       |  2 +-
 testsuite/expect/test5.6        |  2 +-
 testsuite/expect/test6.10       |  6 +++---
 testsuite/expect/test6.12       |  2 +-
 testsuite/expect/test6.8        |  2 +-
 testsuite/expect/test7.1        |  2 +-
 testsuite/expect/test7.11       |  2 +-
 testsuite/expect/test7.7.prog.c |  4 ++--
 testsuite/expect/test8.1        |  2 +-
 testsuite/expect/test8.2        |  2 +-
 testsuite/expect/test8.20       |  2 +-
 testsuite/expect/test8.21       |  4 ++--
 testsuite/expect/test8.22       |  2 +-
 testsuite/expect/test8.23       |  4 ++--
 testsuite/expect/test8.24       |  4 ++--
 testsuite/expect/test8.25       |  2 +-
 testsuite/expect/test8.3        |  2 +-
 testsuite/expect/test8.4        |  4 ++--
 testsuite/expect/test8.5        |  4 ++--
 testsuite/expect/test8.6        |  4 ++--
 testsuite/expect/test8.8        |  2 +-
 testsuite/expect/test8.9        |  2 +-
 testsuite/expect/test9.3        |  2 +-
 testsuite/expect/test9.4        |  2 +-
 testsuite/expect/test9.7        |  2 +-
 testsuite/expect/test9.8        |  4 ++--
 85 files changed, 117 insertions(+), 117 deletions(-)

diff --git a/testsuite/expect/README b/testsuite/expect/README
index bf1f0289ffc..3b1da346ce6 100644
--- a/testsuite/expect/README
+++ b/testsuite/expect/README
@@ -713,7 +713,7 @@ test32.5   Validates that sgather -k keeps the original source file.
 test32.6   Validates that sgather -C compress the copied file.
 test32.7   Validates that sgather -f ignores nonexistent source files.
 test32.8   Validates that sgather -F changes the fanout message.
-test32.9   Validates that sgather -p option perserves file state.
+test32.9   Validates that sgather -p option preserves file state.
 test32.10  Validates that sgather -r copies files recursively.
 test32.11  Validates that sgather -v prints the output logging of the job.
 test32.12  Validates that sgather -t changes the timeout message.
diff --git a/testsuite/expect/globals b/testsuite/expect/globals
index 0400690d9d6..ab845332a29 100755
--- a/testsuite/expect/globals
+++ b/testsuite/expect/globals
@@ -192,7 +192,7 @@ cset bin_printenv "printenv"
 cset max_job_delay 120
 
 #
-# Files must be propogated between nodes within this number of seconds.
+# Files must be propagated between nodes within this number of seconds.
 # The delay may be due to NFS.
 #
 cset max_file_delay 90
@@ -783,7 +783,7 @@ proc wait_for_all_jobs { job_name incr_sleep } {
 #
 # Proc: test_fast_schedule_2
 #
-# Purpose: Determine if we are runnning FastSchedule=2 usually meaning we are pretending we have more resources than reality.
+# Purpose: Determine if we are running FastSchedule=2 usually meaning we are pretending we have more resources than reality.
 # This is based upon
 # the value of FastSchedule in the slurm.conf.
 #
@@ -1468,7 +1468,7 @@ proc test_front_end { } {
 #
 # Proc: test_multiple_slurmd
 #
-# Returns 1 if running multple slurmd per node
+# Returns 1 if running multiple slurmd per node
 #
 ################################################################
 
diff --git a/testsuite/expect/test1.10 b/testsuite/expect/test1.10
index 6971820ee3d..18f0c5a43b4 100755
--- a/testsuite/expect/test1.10
+++ b/testsuite/expect/test1.10
@@ -43,7 +43,7 @@ if {[test_alps]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
 	exit $exit_code
 } elseif { [test_launch_poe] } {
-	send_user "\nWARNING: This test is incompatable with launch/poe systems\n"
+	send_user "\nWARNING: This test is incompatible with launch/poe systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test1.14 b/testsuite/expect/test1.14
index 36170bad59a..1bbfde8e641 100755
--- a/testsuite/expect/test1.14
+++ b/testsuite/expect/test1.14
@@ -140,7 +140,7 @@ if { $matches > $tasks_per_node } {
 }
 
 if {$exit_code == 0} {
-	send_user "\nSo far, so good. Trying with --imediate option\n\n"
+	send_user "\nSo far, so good. Trying with --immediate option\n\n"
 } else {
 	exit $exit_code
 }
diff --git a/testsuite/expect/test1.20 b/testsuite/expect/test1.20
index 2b688c1f32a..12b2b3baef1 100755
--- a/testsuite/expect/test1.20
+++ b/testsuite/expect/test1.20
@@ -39,12 +39,12 @@ set exit_code        0
 print_header $test_id
 
 if { [test_launch_poe] } {
-	send_user "\nWARNING: This test is incompatable with launch/poe systems\n"
+	send_user "\nWARNING: This test is incompatible with launch/poe systems\n"
 	exit $exit_code
 }
 
 if { [test_alps] } {
-	send_user "\nWARNING: This test is incompatable with cray systems\n"
+	send_user "\nWARNING: This test is incompatible with cray systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test1.24 b/testsuite/expect/test1.24
index 114d7c5b21f..a0b07993eae 100755
--- a/testsuite/expect/test1.24
+++ b/testsuite/expect/test1.24
@@ -39,7 +39,7 @@ set exit_code   0
 print_header $test_id
 
 if {[test_wiki_sched] == 1} {
-	send_user "\nWARNING: not compatable with sched/wiki (Maui)\n"
+	send_user "\nWARNING: not compatible with sched/wiki (Maui)\n"
 	send_user "         or sched/wiki2 (Moab) schedulers\n"
 	exit $exit_code
 }
diff --git a/testsuite/expect/test1.35 b/testsuite/expect/test1.35
index 070b947d6d9..2f1c52291d3 100755
--- a/testsuite/expect/test1.35
+++ b/testsuite/expect/test1.35
@@ -73,7 +73,7 @@ log_user 1
 # Build input script file
 # Sleep between initiation of job steps to avoid overwhelming slurmd
 #
-# NOTE: Explicity set a small memory limit. Without explicitly setting the step
+# NOTE: Explicitly set a small memory limit. Without explicitly setting the step
 #   memory limit, it will use the system default (same as the job) which may
 #   prevent the level of parallelism desired.
 #
diff --git a/testsuite/expect/test1.53 b/testsuite/expect/test1.53
index 6de985114e3..845207c466e 100755
--- a/testsuite/expect/test1.53
+++ b/testsuite/expect/test1.53
@@ -40,7 +40,7 @@ set file_prog    "test$test_id.prog"
 print_header $test_id
 
 if { [test_launch_poe] } {
-	send_user "\nWARNING: This test is incompatable with launch/poe systems\n"
+	send_user "\nWARNING: This test is incompatible with launch/poe systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test1.64 b/testsuite/expect/test1.64
index 5ccf8df4b10..76e3dfba303 100755
--- a/testsuite/expect/test1.64
+++ b/testsuite/expect/test1.64
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Test interuption of srun while waiting for resource allocation.
+#          Test interruption of srun while waiting for resource allocation.
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
diff --git a/testsuite/expect/test1.67 b/testsuite/expect/test1.67
index 452d3ce275a..7137d69fe9f 100755
--- a/testsuite/expect/test1.67
+++ b/testsuite/expect/test1.67
@@ -51,7 +51,7 @@ if {[test_bluegene]} {
 	exit $exit_code
 }
 
-# remove any remainging files
+# remove any remaining files
 exec $bin_rm -f $test_timer $test_srun $file_in
 
 make_bash_script $test_timer "
diff --git a/testsuite/expect/test1.68 b/testsuite/expect/test1.68
index 9214a2894a2..3370e84301d 100755
--- a/testsuite/expect/test1.68
+++ b/testsuite/expect/test1.68
@@ -67,7 +67,7 @@ echo \"Test finished\"
 make_bash_script $stop_srun "
 $bin_sleep 15
 srun_proc=\$(ps -C srun -o pid=)
-echo \"sending job to the backgound, pid=\$srun_proc\"
+echo \"sending job to the background, pid=\$srun_proc\"
 kill -s stop \$srun_proc
 "
 
@@ -93,7 +93,7 @@ set fini_match 0
 set time_num 0
 spawn bash -i $file_in
 expect {
-	-re "sending job to the backgound" {
+	-re "sending job to the background" {
 		if {$time_num == 0} {
 			send_user "\nFAILURE: srun is not generating output\n"
 			set exit_code 1
diff --git a/testsuite/expect/test1.69 b/testsuite/expect/test1.69
index 2fb04c3feff..380a5dffa64 100755
--- a/testsuite/expect/test1.69
+++ b/testsuite/expect/test1.69
@@ -59,7 +59,7 @@ if {![string compare $select_type "bluegene"]} {
 	exit $exit_code
 }
 
-# remove any remainging files
+# remove any remaining files
 exec $bin_rm -f $test_timer $test_srun $file_in
 
 make_bash_script $test_timer "
diff --git a/testsuite/expect/test1.71 b/testsuite/expect/test1.71
index 3418432ff1c..2163a7db6a1 100755
--- a/testsuite/expect/test1.71
+++ b/testsuite/expect/test1.71
@@ -111,7 +111,7 @@ expect {
 }
 
 if {$error_match != 2} {
-	send_user "\nFAILURE: srun did not have a segmentation error when runnning the program ($error_match != 2)\n"
+	send_user "\nFAILURE: srun did not have a segmentation error when running the program ($error_match != 2)\n"
 	set exit_code 1
 } else {
 	send_user "\nThis error is expected\n"
diff --git a/testsuite/expect/test1.73 b/testsuite/expect/test1.73
index ad667032ce6..5c59ea1497e 100755
--- a/testsuite/expect/test1.73
+++ b/testsuite/expect/test1.73
@@ -55,7 +55,7 @@ if {[is_super_user] == 0} {
 }
 
 #
-# Slurm time limit enforcement is performed within one minute of the actucal
+# Slurm time limit enforcement is performed within one minute of the actual
 # job time limit, so a one minute limit job will be killed 60 to 120 seconds
 # after initiation. With OverTimeLimit=2, that is moved to 180 to 240 seconds.
 #
diff --git a/testsuite/expect/test1.74 b/testsuite/expect/test1.74
index a15af6776cd..c2a1c36e0e7 100755
--- a/testsuite/expect/test1.74
+++ b/testsuite/expect/test1.74
@@ -210,7 +210,7 @@ if {[add_child $acct_c1 $acct_c2 [expr $node_cnt - 2] -1]} {
 ############################# Test QoS Limits #################################
 
 if {[mod_acct $acct [array get mod_acct_desc_vals] [array get mod_acct_vals] [array get mod_acct_assoc_vals]] != 0} {
-	send_user "\nFAILURE: acount was not modified\n"
+	send_user "\nFAILURE: account was not modified\n"
 	cleanup
 	exit 1
 }
@@ -227,7 +227,7 @@ srun_test [expr $node_cnt-1] $acct
 # now make sure the maxnodes of the QOS overrides the association
 set mod_acct_assoc_vals(maxnodes) 1
 if {[mod_acct $acct [array get mod_acct_desc_vals] [array get mod_acct_vals] [array get mod_acct_assoc_vals]] != 0} {
-	send_user "\nFAILURE: acount was not modified\n"
+	send_user "\nFAILURE: account was not modified\n"
 	cleanup
 	exit 1
 }
@@ -244,7 +244,7 @@ srun_test [expr $node_cnt-1] $acct
 # now make sure the grpnodes of the QOS overrides the association
 set mod_acct_assoc_vals(grpnodes) 1
 if {[mod_acct $acct [array get mod_acct_desc_vals] [array get mod_acct_vals] [array get mod_acct_assoc_vals]] != 0} {
-	send_user "\nFAILURE: acount was not modified\n"
+	send_user "\nFAILURE: account was not modified\n"
 	cleanup
 	exit 1
 }
@@ -256,7 +256,7 @@ set mod_acct_assoc_vals(grpnodes) -1
 set mod_acct_assoc_vals(maxnodes) 1
 
 if {[mod_acct $acct [array get mod_acct_desc_vals] [array get mod_acct_vals] [array get mod_acct_assoc_vals]] != 0} {
-	send_user "\nFAILURE: acount was not modified\n"
+	send_user "\nFAILURE: account was not modified\n"
 	cleanup
 	exit 1
 }
diff --git a/testsuite/expect/test1.83 b/testsuite/expect/test1.83
index bec1704beb8..5cbd451bd4a 100755
--- a/testsuite/expect/test1.83
+++ b/testsuite/expect/test1.83
@@ -45,7 +45,7 @@ set exit_code   0
 print_header $test_id
 
 if {[test_wiki_sched] == 1} {
-	send_user "\nWARNING: not compatable with sched/wiki (Maui)\n"
+	send_user "\nWARNING: not compatible with sched/wiki (Maui)\n"
 	send_user "         or sched/wiki2 (Moab) schedulers\n"
 	exit $exit_code
 } elseif {[test_front_end]} {
diff --git a/testsuite/expect/test1.87 b/testsuite/expect/test1.87
index 7ceb3307453..64630388006 100755
--- a/testsuite/expect/test1.87
+++ b/testsuite/expect/test1.87
@@ -46,7 +46,7 @@ if {[test_front_end] != 0} {
 	send_user "\nWARNING: This test is incompatible with front-end systems\n"
 	exit 0
 } elseif {[test_serial]} {
-	send_user "\nWARNING: This test is incomatible with front-end systems\n"
+	send_user "\nWARNING: This test is incompatible with front-end systems\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test1.89 b/testsuite/expect/test1.89
index 65399f34301..abe101cc31f 100755
--- a/testsuite/expect/test1.89
+++ b/testsuite/expect/test1.89
@@ -268,7 +268,7 @@ expect {
 # Both task/affinity and task/cpu will generate verbose message,
 # so check for double messages in case both plugins are configured.
 if {$verbose_cnt != $task_cnt && $verbose_cnt != [expr $task_cnt * 2]} {
-	send_user "\nFAILURE: verbose messages count inconsisent ($verbose_cnt != $task_cnt)\n"
+	send_user "\nFAILURE: verbose messages count inconsistent ($verbose_cnt != $task_cnt)\n"
 	set exit_code 1
 }
 
@@ -340,7 +340,7 @@ while {$cpu_cnt < $task_cnt} {
 }
 
 #
-# Generate foward and reverse masks and maps
+# Generate forward and reverse masks and maps
 #
 set cpu_cnt 0
 set fwd_mask ""
diff --git a/testsuite/expect/test1.90 b/testsuite/expect/test1.90
index 7993c3a0910..38f91869e88 100755
--- a/testsuite/expect/test1.90
+++ b/testsuite/expect/test1.90
@@ -292,7 +292,7 @@ expect {
 	-re $prompt
 }
 if {$verbose_cnt != $task_cnt} {
-	send_user "\nFAILURE: verbose messages count inconsisent ($verbose_cnt,$task_cnt)\n"
+	send_user "\nFAILURE: verbose messages count inconsistent ($verbose_cnt,$task_cnt)\n"
 	set exit_code 1
 }
 
@@ -364,7 +364,7 @@ while {$cpu_cnt < $task_cnt} {
 }
 
 #
-# Generate foward and reverse masks and maps
+# Generate forward and reverse masks and maps
 #
 set cpu_cnt 0
 set fwd_mask ""
diff --git a/testsuite/expect/test1.93 b/testsuite/expect/test1.93
index c39e7d481eb..97d2e66f138 100755
--- a/testsuite/expect/test1.93
+++ b/testsuite/expect/test1.93
@@ -143,7 +143,7 @@ if {[string compare $host_0 ""] == 0} {
 	set exit_code   1
 }
 if {[string compare $host_0 $host_1] == 0} {
-	send_user "\nFAILURE: mulitple tasks ran on a single node with --mpi=lam option\n"
+	send_user "\nFAILURE: multiple tasks ran on a single node with --mpi=lam option\n"
 	set exit_code   1
 }
 
diff --git a/testsuite/expect/test1.97 b/testsuite/expect/test1.97
index 6208b01c315..b66251034ca 100755
--- a/testsuite/expect/test1.97
+++ b/testsuite/expect/test1.97
@@ -54,7 +54,7 @@ if {![string match *CR_PACK_NODES* [test_select_type_params]]} {
 }
 
 if {[test_front_end] != 0} {
-	send_user "\nWARNING: this test is not compatable with front-end configurations\n"
+	send_user "\nWARNING: this test is not compatible with front-end configurations\n"
 	exit 0
 }
 
@@ -279,7 +279,7 @@ proc submit_tasks {ntasks ntaskpn} {
 	}
 
 	if {$x != 3} {
-		send_user "\nFAILURE: srun did not submit the jobs correctlty $x != 3\n"
+		send_user "\nFAILURE: srun did not submit the jobs correctly $x != 3\n"
 		exit 1
 	}
 }
diff --git a/testsuite/expect/test1.99 b/testsuite/expect/test1.99
index 699eab7fca5..0b10389ced0 100755
--- a/testsuite/expect/test1.99
+++ b/testsuite/expect/test1.99
@@ -58,7 +58,7 @@ foreach p $range {
 
 if {[expr $ports(1) - $ports(0)] < 5} {
 	send_user "\nWARNING: this test requires SrunPortRange to be "
-	send_user "configured with atleast 5 ports\n"
+	send_user "configured with at least 5 ports\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test11.1 b/testsuite/expect/test11.1
index b62db119546..4b437a42875 100755
--- a/testsuite/expect/test11.1
+++ b/testsuite/expect/test11.1
@@ -45,7 +45,7 @@ set task_count  0
 print_header $test_id
 
 if { ![test_launch_poe] } {
-	send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
+	send_user "\nWARNING: This test is only compatible with launch/poe systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test11.2 b/testsuite/expect/test11.2
index 3fd9973bcbe..4e7e7dc21c1 100755
--- a/testsuite/expect/test11.2
+++ b/testsuite/expect/test11.2
@@ -41,7 +41,7 @@ set exit_code   0
 print_header $test_id
 
 if { ![test_launch_poe] } {
-	send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
+	send_user "\nWARNING: This test is only compatible with launch/poe systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test11.3 b/testsuite/expect/test11.3
index 41e5ed9ad80..411fc5e1a3d 100755
--- a/testsuite/expect/test11.3
+++ b/testsuite/expect/test11.3
@@ -42,7 +42,7 @@ set protos      0
 print_header    $test_id
 
 if { ![test_launch_poe] } {
-	send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
+	send_user "\nWARNING: This test is only compatible with launch/poe systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test11.4 b/testsuite/expect/test11.4
index 0738569d9a3..9db9cf304af 100755
--- a/testsuite/expect/test11.4
+++ b/testsuite/expect/test11.4
@@ -42,7 +42,7 @@ set script      "mpi-testscripts/script.slurm.sh"
 print_header $test_id
 
 if { ![test_launch_poe] } {
-	send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
+	send_user "\nWARNING: This test is only compatible with launch/poe systems\n"
 	exit $exit_code
 }
 if { ![file exists mpi-testscripts/allred] } {
diff --git a/testsuite/expect/test11.6 b/testsuite/expect/test11.6
index 5dfa996ff0d..b04d7da0812 100755
--- a/testsuite/expect/test11.6
+++ b/testsuite/expect/test11.6
@@ -40,7 +40,7 @@ set job_id     0
 print_header $test_id
 
 if { ![test_launch_poe] } {
-	send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
+	send_user "\nWARNING: This test is only compatible with launch/poe systems\n"
 	exit $exit_code
 }
 if { [test_super_user] == 0 } {
diff --git a/testsuite/expect/test11.7 b/testsuite/expect/test11.7
index 91505c5c80d..801cdea2105 100755
--- a/testsuite/expect/test11.7
+++ b/testsuite/expect/test11.7
@@ -48,7 +48,7 @@ print_header $test_id
 exec $bin_rm -f $hostfile
 
 if { ![test_launch_poe] } {
-	send_user "\nWARNING: This test is only compatable with launch/poe systems\n"
+	send_user "\nWARNING: This test is only compatible with launch/poe systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test12.2 b/testsuite/expect/test12.2
index bdaf78f99e1..b530146ccd1 100755
--- a/testsuite/expect/test12.2
+++ b/testsuite/expect/test12.2
@@ -363,7 +363,7 @@ if {$matches < $match_target} {
 }
 
 #
-# Report the sacct accouting info
+# Report the sacct accounting info
 # Note we load each digit of seconds individually to avoid this error:
 #   expected integer but got "08" (looks like invalid octal number)
 #
diff --git a/testsuite/expect/test12.4 b/testsuite/expect/test12.4
index 588eccdb82c..20617f5f634 100755
--- a/testsuite/expect/test12.4
+++ b/testsuite/expect/test12.4
@@ -661,7 +661,7 @@ if {$matches != 4} {
 
 set matches [sacct_job -verbose $job_id]
 if {$matches != 4} {
-	send_user "\nFAILURE: sacct --verbosee failed ($matches != 4)\n"
+	send_user "\nFAILURE: sacct --verbose failed ($matches != 4)\n"
 	set exit_code 1
 }
 
diff --git a/testsuite/expect/test13.1 b/testsuite/expect/test13.1
index 8b213f13a8d..46a45f8c452 100755
--- a/testsuite/expect/test13.1
+++ b/testsuite/expect/test13.1
@@ -86,7 +86,7 @@ expect {
 }
 log_user 1
 if {$step_delay == 0} {
-	send_user "\nWARNING: not running compatable switch, this test is not applicable\n"
+	send_user "\nWARNING: not running compatible switch, this test is not applicable\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test13.2 b/testsuite/expect/test13.2
index 253bc148b0c..cfd1e09941a 100755
--- a/testsuite/expect/test13.2
+++ b/testsuite/expect/test13.2
@@ -38,7 +38,7 @@ set smd_system 1
 print_header $test_id
 
 if {[test_switch_nrt] == 0} {
-	send_user "\nWARNING: This test is only compatable with switch/nrt systems\n"
+	send_user "\nWARNING: This test is only compatible with switch/nrt systems\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test14.4 b/testsuite/expect/test14.4
index 3c278d4e011..11cf517bf8c 100755
--- a/testsuite/expect/test14.4
+++ b/testsuite/expect/test14.4
@@ -61,7 +61,7 @@ if {[slurmd_user_root] == 0} {
 #
 # Delete left-over stdout/err files
 # Build input script file that broacasts a file
-# NOTE: we broadcast the file "sbcast", just for convenienc
+# NOTE: we broadcast the file "sbcast", just for convenience
 #
 set pid         [pid]
 set file1       "/tmp/test.$test_id.$pid.1"
diff --git a/testsuite/expect/test15.10 b/testsuite/expect/test15.10
index f9257d4b631..dfca36e18c9 100755
--- a/testsuite/expect/test15.10
+++ b/testsuite/expect/test15.10
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Confirm that a job allocates the proper procesor count (--tasks)
+#          Confirm that a job allocates the proper processor count (--tasks)
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
diff --git a/testsuite/expect/test15.11 b/testsuite/expect/test15.11
index f9e65c3ae2a..f2e195433fa 100755
--- a/testsuite/expect/test15.11
+++ b/testsuite/expect/test15.11
@@ -41,13 +41,13 @@ set name_read   ""
 print_header $test_id
 
 if {[test_wiki_sched] == 1} {
-	send_user "\nWARNING: not compatable with sched/wiki (Maui)\n"
+	send_user "\nWARNING: not compatible with sched/wiki (Maui)\n"
 	send_user "         or sched/wiki2 (Moab) schedulers\n"
 	exit $exit_code
 }
 set prio_type [priority_type]
 if {[string compare $prio_type "multifactor"] == 0} {
-	send_user "\nWARNING: not compatable with priority/multifactor\n"
+	send_user "\nWARNING: not compatible with priority/multifactor\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test15.12 b/testsuite/expect/test15.12
index ed398cbaa53..e415231073a 100755
--- a/testsuite/expect/test15.12
+++ b/testsuite/expect/test15.12
@@ -40,7 +40,7 @@ set file_in     "test$test_id.input"
 print_header $test_id
 
 if {[test_wiki_sched] == 1} {
-	send_user "\nWARNING: not compatable with sched/wiki (Maui)\n"
+	send_user "\nWARNING: not compatible with sched/wiki (Maui)\n"
 	send_user "         or sched/wiki2 (Moab) schedulers\n"
 	exit $exit_code
 }
diff --git a/testsuite/expect/test15.19 b/testsuite/expect/test15.19
index d658030c227..95b4377cb4b 100755
--- a/testsuite/expect/test15.19
+++ b/testsuite/expect/test15.19
@@ -74,7 +74,7 @@ expect {
 		if { [test_front_end] } {
 			send_user "\nWARNING: error expected, Testing is incompatible with front-end systems\n"
 		} else {
-			 send_user "\nWARNING: test not compatable with this configuration\n"
+			 send_user "\nWARNING: test not compatible with this configuration\n"
 		}
 		if {$job_id != 0} {
                         cancel_job $job_id
diff --git a/testsuite/expect/test15.26 b/testsuite/expect/test15.26
index 9a8f5c37d20..323d6bbfecb 100755
--- a/testsuite/expect/test15.26
+++ b/testsuite/expect/test15.26
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Test interuption of salloc while waiting for resource allocation.
+#          Test interruption of salloc while waiting for resource allocation.
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
diff --git a/testsuite/expect/test15.9 b/testsuite/expect/test15.9
index 2df84c1496f..49d204bebeb 100755
--- a/testsuite/expect/test15.9
+++ b/testsuite/expect/test15.9
@@ -97,7 +97,7 @@ if { $job_id == 0 } {
 }
 
 #
-# Confirm exit code is propogated
+# Confirm exit code is propagated
 #
 if { $match != 1 } {
 	send_user "\nFAILURE: salloc exit code not reported\n"
diff --git a/testsuite/expect/test17.12 b/testsuite/expect/test17.12
index 923b3a16224..867f6725b49 100755
--- a/testsuite/expect/test17.12
+++ b/testsuite/expect/test17.12
@@ -40,7 +40,7 @@ set file_in     "test$test_id.input"
 print_header $test_id
 
 if {[test_wiki_sched] == 1} {
-	send_user "\nWARNING: not compatable with sched/wiki (Maui)\n"
+	send_user "\nWARNING: not compatible with sched/wiki (Maui)\n"
 	send_user "         or sched/wiki2 (Moab) schedulers\n"
 	exit $exit_code
 }
diff --git a/testsuite/expect/test17.18 b/testsuite/expect/test17.18
index fce2a6643f1..e655491601b 100755
--- a/testsuite/expect/test17.18
+++ b/testsuite/expect/test17.18
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Test of job dependencies and deferred begin time (--depedency
+#          Test of job dependencies and deferred begin time (--dependency
 #          and --begin options).
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
diff --git a/testsuite/expect/test17.23 b/testsuite/expect/test17.23
index b9b735e4344..ef665af4e1b 100755
--- a/testsuite/expect/test17.23
+++ b/testsuite/expect/test17.23
@@ -45,7 +45,7 @@ set job_prio3   0
 print_header $test_id
 
 if {[test_wiki_sched] == 1} {
-	send_user "\nWARNING: not compatable with sched/wiki (Maui)\n"
+	send_user "\nWARNING: not compatible with sched/wiki (Maui)\n"
 	send_user "         or sched/wiki2 (Moab) schedulers\n"
 	exit $exit_code
 }
diff --git a/testsuite/expect/test17.34 b/testsuite/expect/test17.34
index 658b2a272bf..933be1f665b 100755
--- a/testsuite/expect/test17.34
+++ b/testsuite/expect/test17.34
@@ -46,7 +46,7 @@ set exit_code  0
 #
 # exp_node = 0: job must only use the specified node
 # exp_node = 1: job must use more then specified node
-# exp_node = -1: job must fail because the job execeeds the number or cores
+# exp_node = -1: job must fail because the job exceeds the number or cores
 #
 #############################################################################
 proc core_spec_job {task node core_spec exp_nodes} {
@@ -275,7 +275,7 @@ core_spec_job -2 $first_node [expr $core_cnt - 2] 0
 
 #
 # Using core spec with more tasks then the node can handle. This should
-# cause the tasks to spread accross mutliple nodes as needed
+# cause the tasks to spread across multiple nodes as needed
 #
 send_user "\n\nSpread job across multiple nodes\n"
 core_spec_job 1 $first_node [expr $core_cnt - 2] 1
diff --git a/testsuite/expect/test17.36 b/testsuite/expect/test17.36
index 6ed8641494b..b59dcd6ec85 100755
--- a/testsuite/expect/test17.36
+++ b/testsuite/expect/test17.36
@@ -264,7 +264,7 @@ proc check_part { } {
 # Check that partition names have not been used
 check_part
 
-# Remove any vestigial paritions or scripts
+# Remove any vestigial partitions or scripts
 exec $bin_rm -f $file_in
 
 make_bash_script $file_in "sleep 10"
diff --git a/testsuite/expect/test17.5 b/testsuite/expect/test17.5
index 8713ac42080..f036ef6f851 100755
--- a/testsuite/expect/test17.5
+++ b/testsuite/expect/test17.5
@@ -80,7 +80,7 @@ expect {
 }
 
 #
-# Spawn a sbatch command to varify that the default output file is
+# Spawn a sbatch command to verify that the default output file is
 # created and contain the correct contents
 #
 set job_id 0
diff --git a/testsuite/expect/test17.6 b/testsuite/expect/test17.6
index 8767de148a5..37a26374fbb 100755
--- a/testsuite/expect/test17.6
+++ b/testsuite/expect/test17.6
@@ -90,7 +90,7 @@ if {$job_id != 0} {
 		}
 	}
 	if {$tasks < $task_cnt} {
-		send_user "\nFAILURE: sbatch --tasks not satsified\n"
+		send_user "\nFAILURE: sbatch --tasks not satisfied\n"
 		set exit_code 1
 	}
 	if {[wait_for_job $job_id "DONE"] != 0} {
diff --git a/testsuite/expect/test2.13 b/testsuite/expect/test2.13
index c274e768f46..db3d07520a1 100755
--- a/testsuite/expect/test2.13
+++ b/testsuite/expect/test2.13
@@ -66,7 +66,7 @@ make_bash_script $file_in1 "
 #
 # Build step file
 # The second sleep is because with some proctrack plugins, the bash shell may
-# be terminiated slighly later than the first sleep process
+# be terminated slighly later than the first sleep process
 #
 make_bash_script $file_in2 "
   $bin_echo STEP_BEGIN
@@ -107,7 +107,7 @@ if {[wait_for_job $job_id "RUNNING"] != 0} {
 sleep 5
 
 #
-# Validate that step's origianl time limit
+# Validate that step's original time limit
 #
 spawn  $scontrol show step $job_id.$step_id
 expect {
diff --git a/testsuite/expect/test2.5 b/testsuite/expect/test2.5
index 2f13532a58a..e5d21123446 100755
--- a/testsuite/expect/test2.5
+++ b/testsuite/expect/test2.5
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Validate scontrol show commands for configuation, daemons,
+#          Validate scontrol show commands for configuration, daemons,
 #          nodes, frontends, and partitions.
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
diff --git a/testsuite/expect/test21.20 b/testsuite/expect/test21.20
index ea35c761e06..66284a90dd4 100755
--- a/testsuite/expect/test21.20
+++ b/testsuite/expect/test21.20
@@ -188,9 +188,9 @@ if {$matches != 27} {
 
 #modify user1 QoS
 
-# First array: information about user (ie. cluster,acount,partition...)
-# Second array: account inforamtion about user (ie. adminlevel, default account, ...)
-# Third array: assocoiation information about user (ie. fairshare, grpcpumins, grpcpu...)
+# First array: information about user (ie. cluster,account,partition...)
+# Second array: account information about user (ie. adminlevel, default account, ...)
+# Third array: association information about user (ie. fairshare, grpcpumins, grpcpu...)
 
 incr exit_code [mod_user $tu1 [array get user_mod_info] [array get user_mod_acct] [array get user_mod_assoc]]
 if { $exit_code } {
@@ -236,9 +236,9 @@ if {$matches != 21} {
 
 #modify user2 QoS
 
-# First array: information about user (ie. cluster,acount,partition...)
-# Second array: account inforamtion about user (ie. adminlevel, default account, ...)
-# Third array: assocoiation information about user (ie. fairshare, grpcpumins, grpcpu...)
+# First array: information about user (ie. cluster,account,partition...)
+# Second array: account information about user (ie. adminlevel, default account, ...)
+# Third array: association information about user (ie. fairshare, grpcpumins, grpcpu...)
 
 incr exit_code [mod_user $tu2 [array get user_mod_info2] [array get user_mod_acct2] [array get user_mod_assoc2]]
 
@@ -290,9 +290,9 @@ if {$matches != 15} {
 
 #modify user3 QoS
 
-# First array: information about user (ie. cluster,acount,partition...)
-# Second array: account inforamtion about user (ie. adminlevel, default account, ...)
-# Third array: assocoiation information about user (ie. fairshare, grpcpumins, grpcpu...)
+# First array: information about user (ie. cluster,account,partition...)
+# Second array: account information about user (ie. adminlevel, default account, ...)
+# Third array: association information about user (ie. fairshare, grpcpumins, grpcpu...)
 
 incr exit_code [mod_user $tu3 [array get user_mod_info3] [array get user_mod_acct3] [array get user_mod_assoc3]]
 
diff --git a/testsuite/expect/test21.30 b/testsuite/expect/test21.30
index 921e47b4aa8..b1ea572b5cb 100755
--- a/testsuite/expect/test21.30
+++ b/testsuite/expect/test21.30
@@ -327,7 +327,7 @@ if {![string compare $select_type "linear"] || [default_part_exclusive]} {
 	exit 0
 }
 
-# Remove any vesitgial accounts or qos
+# Remove any vestigial accounts or qos
 spawn $sacctmgr -i delete qos $qostest
 expect {
 	-re "Deleting QOS(s)" {
diff --git a/testsuite/expect/test21.7 b/testsuite/expect/test21.7
index cd243398583..e2de23464f1 100755
--- a/testsuite/expect/test21.7
+++ b/testsuite/expect/test21.7
@@ -72,7 +72,7 @@ if { [test_account_storage] == 0 } {
 }
 
 #
-# Remove any vesitgial clusters
+# Remove any vestigial clusters
 #
 remove_cluster "$tc1,$tc2,$tc3"
 
diff --git a/testsuite/expect/test28.2 b/testsuite/expect/test28.2
index e8d89d7da2a..38d31e1b7e0 100755
--- a/testsuite/expect/test28.2
+++ b/testsuite/expect/test28.2
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          checks that the --array environment varibles are correct, and
+#          checks that the --array environment variables are correct, and
 #          checks that the --output and --error files were created and
 #          contain the correct information.
 #
diff --git a/testsuite/expect/test28.5 b/testsuite/expect/test28.5
index 38055fadb66..d80f9218bf6 100755
--- a/testsuite/expect/test28.5
+++ b/testsuite/expect/test28.5
@@ -2,7 +2,7 @@
 ############################################################################
 # Purpose: Test of SLURM functionality
 #          test that a scontrol can hold and release a whole job array
-#          or an indevidual job index.
+#          or an individual job index.
 #
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
diff --git a/testsuite/expect/test28.7 b/testsuite/expect/test28.7
index 95782e92e71..404eedd18d0 100755
--- a/testsuite/expect/test28.7
+++ b/testsuite/expect/test28.7
@@ -70,7 +70,7 @@ if { $job_id == 0 } {
 }
 
 #
-# Submit a dependent job depedent upon a single job array element of that job array
+# Submit a dependent job dependent upon a single job array element of that job array
 #
 set timeout $max_job_delay
 set match_job_state 0
@@ -122,7 +122,7 @@ if { $job_id == 0 } {
 }
 
 #
-# Submit a dependent job depedent upon a full job array
+# Submit a dependent job dependent upon a full job array
 #
 set timeout $max_job_delay
 set match_job_state 0
diff --git a/testsuite/expect/test3.5 b/testsuite/expect/test3.5
index 1ccf173a063..bbe05396cc2 100755
--- a/testsuite/expect/test3.5
+++ b/testsuite/expect/test3.5
@@ -116,7 +116,7 @@ if {[string compare $def_node ""] == 0} {
 spawn $scontrol create PartitionName=$part_name Nodes=$def_node
 expect {
 	-re "error" {
-		send_user "\nFAILURE: something bad happened on partitiion create\n"
+		send_user "\nFAILURE: something bad happened on partition create\n"
 		set exit_code 1
 		exp_continue
 	}
diff --git a/testsuite/expect/test3.6 b/testsuite/expect/test3.6
index 97761b23813..55bf1af0ee8 100755
--- a/testsuite/expect/test3.6
+++ b/testsuite/expect/test3.6
@@ -136,7 +136,7 @@ if {$found == 1} {
 spawn $scontrol create PartitionName=$part_name Hidden=YES
 expect {
 	-re "error" {
-		send_user "\nFAILURE: something bad happened on partitiion create\n"
+		send_user "\nFAILURE: something bad happened on partition create\n"
 		set exit_code 1
 		exp_continue
 	}
diff --git a/testsuite/expect/test3.7.prog.c b/testsuite/expect/test3.7.prog.c
index 3f92689419b..54bc93f7a33 100644
--- a/testsuite/expect/test3.7.prog.c
+++ b/testsuite/expect/test3.7.prog.c
@@ -1,7 +1,7 @@
 /*****************************************************************************\
  *  test3.7.prog.c - Test of slurm job suspend/resume.
  *
- *  Counts down, printing counter, with sleep(1) with each interation.
+ *  Counts down, printing counter, with sleep(1) with each iteration.
  *  Prints "JobSuspended" if execution is suspended and then resumed.
  *****************************************************************************
  *  Copyright (C) 2005 The Regents of the University of California.
diff --git a/testsuite/expect/test32.2 b/testsuite/expect/test32.2
index 9dfc04269c9..8eba53b665e 100755
--- a/testsuite/expect/test32.2
+++ b/testsuite/expect/test32.2
@@ -52,7 +52,7 @@ expect {
 		exp_continue
 	}
 	timeout {
-		send_user "\nFAILURE: sgather is not resonponding\n"
+		send_user "\nFAILURE: sgather is not responding\n"
 		set exit_code 1
 	}
 	eof {
diff --git a/testsuite/expect/test32.9 b/testsuite/expect/test32.9
index 209aefaa47a..40c44c57f67 100755
--- a/testsuite/expect/test32.9
+++ b/testsuite/expect/test32.9
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Validates that sgather -p option perserves file state.
+#          Validates that sgather -p option preserves file state.
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
diff --git a/testsuite/expect/test33.1 b/testsuite/expect/test33.1
index 362ab4fd96c..b40e6f9f7b3 100755
--- a/testsuite/expect/test33.1
+++ b/testsuite/expect/test33.1
@@ -42,7 +42,7 @@ source ./globals
 # -- lines beginning with # are comments.
 # -- line beginning with a line feed ends a testcase.
 # -- The first line in the testcase is the node list expression to be split
-#    The followiing lines in the testcase are the expected resulting node lists.
+#    The following lines in the testcase are the expected resulting node lists.
 
 set test_id     "33.1"
 set exit_code   0
diff --git a/testsuite/expect/test5.6 b/testsuite/expect/test5.6
index 60c44374f42..7c852e3c1f4 100755
--- a/testsuite/expect/test5.6
+++ b/testsuite/expect/test5.6
@@ -44,7 +44,7 @@ set job_name2    "test$test_id.job2"
 print_header $test_id
 
 if {[job_submit_all_partitions] != 0} {
-	send_user "\nWARNING: This test is incompatable with JobSubmitPlugins=all_partitions\n"
+	send_user "\nWARNING: This test is incompatible with JobSubmitPlugins=all_partitions\n"
 	exit 0
 }
 
diff --git a/testsuite/expect/test6.10 b/testsuite/expect/test6.10
index 3bee9b358e6..782906dd665 100755
--- a/testsuite/expect/test6.10
+++ b/testsuite/expect/test6.10
@@ -45,7 +45,7 @@ set job_id        0
 print_header $test_id
 
 if {[job_submit_all_partitions] != 0} {
-	send_user "\nWARNING: This test is incompatable with JobSubmitPlugins=all_partitions\n"
+	send_user "\nWARNING: This test is incompatible with JobSubmitPlugins=all_partitions\n"
 	exit 0
 }
 
@@ -100,7 +100,7 @@ if {$job_id == 0} {
 }
 
 #
-# Identify this job's parition
+# Identify this job's partition
 #
 set matches  0
 spawn $scancel --interactive $job_id
@@ -120,7 +120,7 @@ expect {
 }
 
 #
-# Kill all jobs by parition and user
+# Kill all jobs by partition and user
 #
 spawn $scancel --interactive --user=$my_login --partition=NO_VAL
 expect {
diff --git a/testsuite/expect/test6.12 b/testsuite/expect/test6.12
index d42c850d206..261b763562f 100755
--- a/testsuite/expect/test6.12
+++ b/testsuite/expect/test6.12
@@ -46,7 +46,7 @@ set job_id      0
 print_header $test_id
 
 if { [test_xcpu] } {
-	send_user "\nWARNING: This test is incomptabible with XCPU system\n"
+	send_user "\nWARNING: This test is incompatible with XCPU system\n"
 	exit $exit_code
 } elseif {[test_alps]} {
 	send_user "\nWARNING: This test is incompatible with Cray systems\n"
diff --git a/testsuite/expect/test6.8 b/testsuite/expect/test6.8
index 9ca7161ef14..73a473cbd94 100755
--- a/testsuite/expect/test6.8
+++ b/testsuite/expect/test6.8
@@ -44,7 +44,7 @@ set job_id2     0
 print_header $test_id
 
 if {[test_wiki_sched] == 1} {
-	send_user "\nWARNING: not compatable with sched/wiki (Maui)\n"
+	send_user "\nWARNING: not compatible with sched/wiki (Maui)\n"
 	send_user "         or sched/wiki2 (Moab) schedulers\n"
 	exit $exit_code
 }
diff --git a/testsuite/expect/test7.1 b/testsuite/expect/test7.1
index 37190c81035..630a478d0c0 100755
--- a/testsuite/expect/test7.1
+++ b/testsuite/expect/test7.1
@@ -45,7 +45,7 @@ set multi                0
 print_header $test_id
 
 if {[test_wiki_sched] == 1} {
-	send_user "\nWARNING: not compatable with sched/wiki (Maui)\n"
+	send_user "\nWARNING: not compatible with sched/wiki (Maui)\n"
 	send_user "         or sched/wiki2 (Moab) schedulers\n"
 	exit $exit_code
 }
diff --git a/testsuite/expect/test7.11 b/testsuite/expect/test7.11
index 75d0ed48388..5c243e494ee 100755
--- a/testsuite/expect/test7.11
+++ b/testsuite/expect/test7.11
@@ -120,7 +120,7 @@ expect {
 	}
 }
 
-# Allow enough time for configuration file in NFS to be propogated
+# Allow enough time for configuration file in NFS to be propagated
 # to all nodes of cluster
 exec sleep 60
 
diff --git a/testsuite/expect/test7.7.prog.c b/testsuite/expect/test7.7.prog.c
index 94f1300f247..38544488c81 100644
--- a/testsuite/expect/test7.7.prog.c
+++ b/testsuite/expect/test7.7.prog.c
@@ -252,7 +252,7 @@ static void _get_jobs(void)
 	if (_xmit(out_msg))
 		exit(1);
 
-	/* Dump volitile data */
+	/* Dump volatile data */
 	snprintf(out_msg, sizeof(out_msg),
 		"TS=%u AUTH=root DT=CMD=GETJOBS ARG=%u:ALL",
 		(uint32_t) now, (uint32_t) 1);
@@ -279,7 +279,7 @@ static void _get_nodes(void)
 	if (_xmit(out_msg))
 		exit(1);
 
-	/* Dump volitile data */
+	/* Dump volatile data */
 	snprintf(out_msg, sizeof(out_msg),
 		"TS=%u AUTH=root DT=CMD=GETNODES ARG=%u:ALL",
 		(uint32_t) now, (uint32_t) 1);
diff --git a/testsuite/expect/test8.1 b/testsuite/expect/test8.1
index 688572f111f..351b9c425aa 100755
--- a/testsuite/expect/test8.1
+++ b/testsuite/expect/test8.1
@@ -44,7 +44,7 @@ set cycle_count 2
 print_header $test_id
 
 if {[test_bluegene] == 0} {
-	send_user "\nWARNING: This test is only compatable with bluegene systems\n"
+	send_user "\nWARNING: This test is only compatible with bluegene systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test8.2 b/testsuite/expect/test8.2
index 592b17666a6..d3a0f4fca04 100755
--- a/testsuite/expect/test8.2
+++ b/testsuite/expect/test8.2
@@ -41,7 +41,7 @@ set job_id           0
 print_header $test_id
 
 if {[test_bluegene] == 0} {
-	send_user "\nWARNING: This test is only compatable with bluegene systems\n"
+	send_user "\nWARNING: This test is only compatible with bluegene systems\n"
 	 exit $exit_code
 }
 
diff --git a/testsuite/expect/test8.20 b/testsuite/expect/test8.20
index 2748d613854..5274d6745b9 100755
--- a/testsuite/expect/test8.20
+++ b/testsuite/expect/test8.20
@@ -40,7 +40,7 @@ set prompt           "PROMPT: "
 print_header $test_id
 
 if {([test_bluegene] == 0) || [string compare [get_bluegene_type] "Q"]} {
-	send_user "\nWARNING: This test is only compatable with Bluegene/Q systems\n"
+	send_user "\nWARNING: This test is only compatible with Bluegene/Q systems\n"
 	exit $exit_code
 } elseif (![test_emulated]) {
 	send_user "\nWARNING: This test will only work on an emulated Blugene/Q system."
diff --git a/testsuite/expect/test8.21 b/testsuite/expect/test8.21
index 0a8941473ea..d7b4f40ce6d 100755
--- a/testsuite/expect/test8.21
+++ b/testsuite/expect/test8.21
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Bluegene/Q only: Test that multple job step allocations are
+#          Bluegene/Q only: Test that multiple job step allocations are
 #          properly packed within the job's allocation
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -42,7 +42,7 @@ set prompt           "PROMPT: "
 print_header $test_id
 
 if {([test_bluegene] == 0) || [string compare [get_bluegene_type] "Q"]} {
-	send_user "\nWARNING: This test is only compatable with Bluegene/Q systems\n"
+	send_user "\nWARNING: This test is only compatible with Bluegene/Q systems\n"
 	exit $exit_code
 } elseif (![test_emulated]) {
 	send_user "\nWARNING: This test will only work on an emulated Blugene/Q system."
diff --git a/testsuite/expect/test8.22 b/testsuite/expect/test8.22
index 9fbbc25cca6..b9d7fda069a 100755
--- a/testsuite/expect/test8.22
+++ b/testsuite/expect/test8.22
@@ -44,7 +44,7 @@ set mpicc_opts       "-q64"
 print_header $test_id
 
 if {([test_bluegene] == 0) || [string compare [get_bluegene_type] "Q"]} {
-	send_user "\nWARNING: This test is only compatable with Bluegene/Q systems\n"
+	send_user "\nWARNING: This test is only compatible with Bluegene/Q systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test8.23 b/testsuite/expect/test8.23
index 3cc26fbf937..956763cdd9a 100755
--- a/testsuite/expect/test8.23
+++ b/testsuite/expect/test8.23
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Bluegene/Q only: Test that multple jobs allocations are properly
+#          Bluegene/Q only: Test that multiple jobs allocations are properly
 #          packed within a midplane
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -40,7 +40,7 @@ set job_size         32
 print_header $test_id
 
 if {([test_bluegene] == 0) || [string compare [get_bluegene_type] "Q"]} {
-	send_user "\nWARNING: This test is only compatable with Bluegene/Q systems\n"
+	send_user "\nWARNING: This test is only compatible with Bluegene/Q systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test8.24 b/testsuite/expect/test8.24
index 66a2ebca9a8..6c00b0b909c 100755
--- a/testsuite/expect/test8.24
+++ b/testsuite/expect/test8.24
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Bluegene/Q only: Test advanced reservation creation with mutliple
+#          Bluegene/Q only: Test advanced reservation creation with multiple
 #          blocks.
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -47,7 +47,7 @@ set ii 0
 print_header $test_id
 
 if {([test_bluegene] == 0) || [string compare [get_bluegene_type] "Q"]} {
-	send_user "\nWARNING: This test is only compatable with Bluegene/Q systems\n"
+	send_user "\nWARNING: This test is only compatible with Bluegene/Q systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test8.25 b/testsuite/expect/test8.25
index 61a602f4c63..ba7c0e9208f 100755
--- a/testsuite/expect/test8.25
+++ b/testsuite/expect/test8.25
@@ -1,7 +1,7 @@
 #!/usr/bin/env expect
 ############################################################################
 # Purpose: Test of SLURM functionality
-#          Bluegene/P only: Confirm that salloc can reserve the HTC partitons.
+#          Bluegene/P only: Confirm that salloc can reserve the HTC partitions.
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
 #          "WARNING: ..." with an explanation of why the test can't be made, OR
diff --git a/testsuite/expect/test8.3 b/testsuite/expect/test8.3
index d81043df852..919a198011e 100755
--- a/testsuite/expect/test8.3
+++ b/testsuite/expect/test8.3
@@ -43,7 +43,7 @@ set job_id      0
 print_header $test_id
 
 if {[test_bluegene] == 0} {
-	send_user "\nWARNING: This test is only compatable with bluegene systems\n"
+	send_user "\nWARNING: This test is only compatible with bluegene systems\n"
 	 exit $exit_code
 }
 
diff --git a/testsuite/expect/test8.4 b/testsuite/expect/test8.4
index 317604f8200..a09bd15ab8c 100755
--- a/testsuite/expect/test8.4
+++ b/testsuite/expect/test8.4
@@ -48,7 +48,7 @@ set job_id             0
 print_header $test_id
 
 if {[test_bluegene] == 0} {
-	send_user "\nWARNING: This test is only compatable with bluegene systems\n"
+	send_user "\nWARNING: This test is only compitable with bluegene systems\n"
 	exit $exit_code
 }
 
@@ -83,7 +83,7 @@ if {[file executable $mpicc] == 0} {
 	exit 0
 }
 if {[test_front_end] == 0} {
-	send_user "\nWARNING: This test is only compatable with front-end systems\n"
+	send_user "\nWARNING: This test is only compatible with front-end systems\n"
 	 exit $exit_code
 }
 
diff --git a/testsuite/expect/test8.5 b/testsuite/expect/test8.5
index c9d549567bf..ba20cc9c5aa 100755
--- a/testsuite/expect/test8.5
+++ b/testsuite/expect/test8.5
@@ -172,12 +172,12 @@ proc run_bgp_test { } {
 print_header $test_id
 
 if {[test_bluegene] == 0} {
-	send_user "\nWARNING: This test is only compatable with bluegene systems\n"
+	send_user "\nWARNING: This test is only compatible with bluegene systems\n"
 	exit $exit_code
 }
 
 if {[string compare [get_bluegene_layout] Dynamic]} {
-	send_user "\nWARNING: This test is only compatable with dynamic bluegene systems\n"
+	send_user "\nWARNING: This test is only compatible with dynamic bluegene systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test8.6 b/testsuite/expect/test8.6
index 94c1fb55119..75af389d4bb 100755
--- a/testsuite/expect/test8.6
+++ b/testsuite/expect/test8.6
@@ -207,12 +207,12 @@ proc run_bgp_test { } {
 print_header $test_id
 
 if {[test_bluegene] == 0} {
-	send_user "\nWARNING: This test is only compatable with bluegene systems\n"
+	send_user "\nWARNING: This test is only compatible with bluegene systems\n"
 	exit $exit_code
 }
 
 if {[string compare [get_bluegene_layout] Dynamic]} {
-	send_user "\nWARNING: This test is only compatable with dynamic bluegene systems\n"
+	send_user "\nWARNING: This test is only compatible with dynamic bluegene systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test8.8 b/testsuite/expect/test8.8
index dbf4e280fa0..b01613a0ca2 100755
--- a/testsuite/expect/test8.8
+++ b/testsuite/expect/test8.8
@@ -387,7 +387,7 @@ proc change_block_state { block state } {
 print_header $test_id
 
 if {[test_bluegene] == 0} {
-	send_user "\nWARNING: This test is only compatable with bluegene systems\n"
+	send_user "\nWARNING: This test is only compatible with bluegene systems\n"
 	exit $exit_code
 }
 
diff --git a/testsuite/expect/test8.9 b/testsuite/expect/test8.9
index 56e50672e7e..04adef929f6 100755
--- a/testsuite/expect/test8.9
+++ b/testsuite/expect/test8.9
@@ -160,7 +160,7 @@ if {$a_size>2} {
 	set geom "1x1x1x2"
 	set z_flag 1
 } else {
-	send_user "\nFAILURE: not enough dimenstions\n"
+	send_user "\nFAILURE: not enough dimentions\n"
 	exit 1
 }
 
diff --git a/testsuite/expect/test9.3 b/testsuite/expect/test9.3
index f3dbac40704..b099ac47a1f 100755
--- a/testsuite/expect/test9.3
+++ b/testsuite/expect/test9.3
@@ -44,7 +44,7 @@ set job_name     "test$test_id"
 set cycle_count [get_cycle_count]
 set task_cnt    $max_stress_tasks
 if { [test_launch_poe] } {
-	send_user "\nWARNING: This test is not compatable with POE systems\n"
+	send_user "\nWARNING: This test is not compatible with POE systems\n"
 	exit $exit_code
 } elseif { [test_bluegene] } {
 	if { [test_emulated] } {
diff --git a/testsuite/expect/test9.4 b/testsuite/expect/test9.4
index f1a680b7512..a2bc2745494 100755
--- a/testsuite/expect/test9.4
+++ b/testsuite/expect/test9.4
@@ -6,7 +6,7 @@
 #          "FAILURE: ..." otherwise with an explanation of the failure, OR
 #          anything else indicates a failure mode that must be investigated.
 #
-# Note:    To avoid one minute NFS propogation delays in the output files,
+# Note:    To avoid one minute NFS propagation delays in the output files,
 #          we create them ahead of time. Without explicity file creation,
 #          this test requires about one minute per cycle to execute.
 #
diff --git a/testsuite/expect/test9.7 b/testsuite/expect/test9.7
index 59c0162d5d0..92ccaf3f14f 100755
--- a/testsuite/expect/test9.7
+++ b/testsuite/expect/test9.7
@@ -58,7 +58,7 @@ for {set inx 0} {$inx < $task_cnt} {incr inx} {
 }
 
 #
-# Test output for successful completion messasge
+# Test output for successful completion message
 #
 set success_cnt 0
 set timeout [expr $max_job_delay * $iterations * $task_cnt]
diff --git a/testsuite/expect/test9.8 b/testsuite/expect/test9.8
index d10c0b2e947..4dd15168950 100755
--- a/testsuite/expect/test9.8
+++ b/testsuite/expect/test9.8
@@ -2,7 +2,7 @@
 ############################################################################
 # Purpose: Stress test with maximum slurmctld message concurrency.
 #          We start a large number of job steps, the simultaneously
-#          cancel them all. Message can get lost/restransmitted, so
+#          cancel them all. Message can get lost/retransmitted, so
 #          there is a delayed test for job step removal.
 #
 # Output:  "TEST: #.#" followed by "SUCCESS" if test was successful, OR
@@ -72,7 +72,7 @@ if {[test_front_end] != 0 || $enable_memory_leak_debug != 0} {
 # NOTE: The initial sleep is so that all of the submissions have time
 #   to occur before contending with a multitude of job step creations.
 #   This is especially important on very slow systems (e.g. AIX).
-# NOTE: Explicity set a small memory limit. Without explicitly setting the step
+# NOTE: Explicitly set a small memory limit. Without explicitly setting the step
 #   memory limit, it will use the system default (same as the job) which may
 #   prevent the level of parallelism desired.
 #
-- 
GitLab