diff --git a/tests/gold_tests/body_factory/http204_response_plugin.test.py b/tests/gold_tests/body_factory/http204_response_plugin.test.py index cc4ca6614d1..72ba642c908 100644 --- a/tests/gold_tests/body_factory/http204_response_plugin.test.py +++ b/tests/gold_tests/body_factory/http204_response_plugin.test.py @@ -1,5 +1,5 @@ ''' -Tests that plugins may break HTTP by sending 204 respose bodies +Tests that plugins may break HTTP by sending 204 response bodies ''' # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -21,7 +21,7 @@ import sys Test.Summary = ''' -Tests that plugins may break HTTP by sending 204 respose bodies +Tests that plugins may break HTTP by sending 204 response bodies ''' ts = Test.MakeATSProcess("ts") diff --git a/tests/gold_tests/cache/disjoint-wait-for-cache.test.py b/tests/gold_tests/cache/disjoint-wait-for-cache.test.py index 44fbbdd8bbf..2e9669f32c7 100644 --- a/tests/gold_tests/cache/disjoint-wait-for-cache.test.py +++ b/tests/gold_tests/cache/disjoint-wait-for-cache.test.py @@ -19,7 +19,7 @@ import uuid Test.Summary = ''' -Same as cache-generaertaion-disjoint, but uses proxy.config.http.wait_for_cache which should delay +Same as cache-generation-disjoint, but uses proxy.config.http.wait_for_cache which should delay the server from accepting connection till the cache is loaded ''' diff --git a/tests/gold_tests/cache/vary-handling.test.py b/tests/gold_tests/cache/vary-handling.test.py index 5467f0672fa..4de1e7d1b93 100644 --- a/tests/gold_tests/cache/vary-handling.test.py +++ b/tests/gold_tests/cache/vary-handling.test.py @@ -1,5 +1,5 @@ ''' -Test correct handling of altenates via the Vary header. +Test correct handling of alternates via the Vary header. ''' # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -18,7 +18,7 @@ # limitations under the License. Test.Summary = ''' -Test correct handling of altenates via the Vary header. +Test correct handling of alternates via the Vary header. ''' ts = Test.MakeATSProcess("ts") diff --git a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py index dee109d1e23..cb0d2f84e43 100644 --- a/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py +++ b/tests/gold_tests/chunked_encoding/chunked_encoding_h2.test.py @@ -53,7 +53,7 @@ 'dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key' ) -# Using netcat as a cheapy origin server in case 1 so we can insert a delay in sending back the response. +# Using netcat as a cheap origin server in case 1 so we can insert a delay in sending back the response. # Replaced microserver for cases 2 and 3 as well because I was getting python exceptions when running # microserver if chunked encoding headers were specified for the request headers diff --git a/tests/gold_tests/continuations/double.test.py b/tests/gold_tests/continuations/double.test.py index 5c5ed68ae57..ef5875f1a1a 100644 --- a/tests/gold_tests/continuations/double.test.py +++ b/tests/gold_tests/continuations/double.test.py @@ -65,8 +65,8 @@ tr = Test.AddTestRun() # Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCommands. -# On Fedora 28/29, it seems that curl will occaisionally timeout after a couple seconds and return exitcode 2 -# Examinig the packet capture shows that Traffic Server dutifully sends the response +# On Fedora 28/29, it seems that curl will occasionally timeout after a couple seconds and return exitcode 2 +# Examining the packet capture shows that Traffic Server dutifully sends the response ps = tr.SpawnCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2)) tr.Processes.Default.Env = ts.Env tr.Processes.Default.ReturnCode = Any(0, 2) diff --git a/tests/gold_tests/continuations/double_h2.test.py b/tests/gold_tests/continuations/double_h2.test.py index 5251b60dc96..0730933c350 100644 --- a/tests/gold_tests/continuations/double_h2.test.py +++ b/tests/gold_tests/continuations/double_h2.test.py @@ -80,8 +80,8 @@ tr = Test.AddTestRun() # Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCommands. -# On Fedora 28/29, it seems that curl will occaisionally timeout after a couple seconds and return exitcode 2 -# Examinig the packet capture shows that Traffic Server dutifully sends the response +# On Fedora 28/29, it seems that curl will occasionally timeout after a couple seconds and return exitcode 2 +# Examining the packet capture shows that Traffic Server dutifully sends the response ps = tr.SpawnCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2)) tr.Processes.Default.Env = ts.Env tr.Processes.Default.ReturnCode = Any(0, 2) @@ -120,7 +120,7 @@ def done_stat_ready(process, hasRunFor, **kw): # number of sessions/transactions opened and closed are equal tr = Test.AddTestRun("Check Ssn") server2.StartupTimeout = 60 -# Again, here the imporant thing is the ready function not the server2 process +# Again, here the important thing is the ready function not the server2 process tr.Processes.Default.StartBefore(server2, ready=make_done_stat_ready(ts.Env)) tr.Processes.Default.Command = comparator_command.format('ssn') tr.Processes.Default.ReturnCode = 0 diff --git a/tests/gold_tests/continuations/openclose.test.py b/tests/gold_tests/continuations/openclose.test.py index 269de16dce9..bebc40c9674 100644 --- a/tests/gold_tests/continuations/openclose.test.py +++ b/tests/gold_tests/continuations/openclose.test.py @@ -57,8 +57,8 @@ tr = Test.AddTestRun() # Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCommands. -# On Fedora 28/29, it seems that curl will occaisionally timeout after a couple seconds and return exitcode 2 -# Examinig the packet capture shows that Traffic Server dutifully sends the response +# On Fedora 28/29, it seems that curl will occasionally timeout after a couple seconds and return exitcode 2 +# Examining the packet capture shows that Traffic Server dutifully sends the response ps = tr.SpawnCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2)) tr.Processes.Default.Env = ts.Env tr.Processes.Default.ReturnCode = Any(0, 2) @@ -97,7 +97,7 @@ def done_stat_ready(process, hasRunFor, **kw): # number of sessions/transactions opened and closed are equal tr = Test.AddTestRun("Check Ssn order errors") server2.StartupTimeout = 60 -# Again, here the imporant thing is the ready function not the server2 process +# Again, here the important thing is the ready function not the server2 process tr.Processes.Default.StartBefore(server2, ready=make_done_stat_ready(ts.Env)) tr.Processes.Default.Command = 'traffic_ctl metric get ssntxnorder_verify.err' tr.Processes.Default.ReturnCode = 0 diff --git a/tests/gold_tests/continuations/openclose_h2.test.py b/tests/gold_tests/continuations/openclose_h2.test.py index 7be9f5d24e7..90e4542c72f 100644 --- a/tests/gold_tests/continuations/openclose_h2.test.py +++ b/tests/gold_tests/continuations/openclose_h2.test.py @@ -69,8 +69,8 @@ tr = Test.AddTestRun() # Create a bunch of curl commands to be executed in parallel. Default.Process is set in SpawnCommands. -# On Fedora 28/29, it seems that curl will occaisionally timeout after a couple seconds and return exitcode 2 -# Examinig the packet capture shows that Traffic Server dutifully sends the response +# On Fedora 28/29, it seems that curl will occasionally timeout after a couple seconds and return exitcode 2 +# Examining the packet capture shows that Traffic Server dutifully sends the response ps = tr.SpawnCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2)) tr.Processes.Default.Env = ts.Env tr.Processes.Default.ReturnCode = Any(0, 2) @@ -110,7 +110,7 @@ def done_stat_ready(process, hasRunFor, **kw): # number of sessions/transactions opened and closed are equal tr = Test.AddTestRun("Check Ssn order errors") server2.StartupTimeout = 60 -# Again, here the imporant thing is the ready function not the server2 process +# Again, here the important thing is the ready function not the server2 process tr.Processes.Default.StartBefore(server2, ready=make_done_stat_ready(ts.Env)) tr.Processes.Default.Command = 'traffic_ctl metric get ssntxnorder_verify.err' tr.Processes.Default.ReturnCode = 0 diff --git a/tests/gold_tests/continuations/session_id.test.py b/tests/gold_tests/continuations/session_id.test.py index 209a8fff3f6..9e8f90d761d 100644 --- a/tests/gold_tests/continuations/session_id.test.py +++ b/tests/gold_tests/continuations/session_id.test.py @@ -65,8 +65,8 @@ numberOfRequests = 100 # Create a bunch of curl commands to be executed in parallel. Default.Process # is set in SpawnCommands. On Fedora 28/29, it seems that curl will -# occaisionally timeout after a couple seconds and return exitcode 2 Examinig -# the packet capture shows that Traffic Server dutifully sends the response +# occasionally timeout after a couple seconds and return exitcode 2 +# Examining the packet capture shows that Traffic Server dutifully sends the response ps = tr.SpawnCommands(cmdstr=cmd, count=numberOfRequests, retcode=Any(0, 2)) tr.Processes.Default.Env = ts.Env tr.Processes.Default.ReturnCode = Any(0, 2) diff --git a/tests/gold_tests/h2/http2.test.py b/tests/gold_tests/h2/http2.test.py index 6bbc62d9403..e6d2801ae35 100644 --- a/tests/gold_tests/h2/http2.test.py +++ b/tests/gold_tests/h2/http2.test.py @@ -182,7 +182,7 @@ tr.StillRunningAfter = server # Test Case 6: Post with chunked body -# While HTTP/2 does not support Tranfer-encoding we pass that into curl to encourage it to not set the content length +# While HTTP/2 does not support Transfer-encoding we pass that into curl to encourage it to not set the content length # on the post body tr = Test.AddTestRun() tr.Processes.Default.Command = 'curl -s -k -H "Transfer-Encoding: chunked" -d "{0}" https://127.0.0.1:{1}/postchunked'.format( @@ -192,7 +192,7 @@ tr.StillRunningAfter = server # Test Case 7: Post with big chunked body -# While HTTP/2 does not support Tranfer-encoding we pass that into curl to encourage it to not set the content length +# While HTTP/2 does not support Transfer-encoding we pass that into curl to encourage it to not set the content length # on the post body tr = Test.AddTestRun() tr.Processes.Default.Command = 'curl -s -k -H "Transfer-Encoding: chunked" -d @big_post_body https://127.0.0.1:{0}/bigpostchunked'.format( @@ -201,7 +201,7 @@ tr.Processes.Default.Streams.All = "gold/post_chunked.gold" tr.StillRunningAfter = server -# Test Case 8: Huge resposne header +# Test Case 8: Huge response header tr = Test.AddTestRun() tr.Processes.Default.Command = 'curl -vs -k --http2 https://127.0.0.1:{0}/huge_resp_hdrs'.format(ts.Variables.ssl_port) tr.Processes.Default.ReturnCode = 0 diff --git a/tests/gold_tests/h2/httpbin.test.py b/tests/gold_tests/h2/httpbin.test.py index d5313612a5a..8b59f15b1ee 100644 --- a/tests/gold_tests/h2/httpbin.test.py +++ b/tests/gold_tests/h2/httpbin.test.py @@ -83,7 +83,7 @@ # Test Cases # ---- -# Test Case 0: Basic request and resposne +# Test Case 0: Basic request and response test_run = Test.AddTestRun() test_run.Processes.Default.Command = "curl -vs -k --http2 https://127.0.0.1:{0}/get | {1}".format( ts.Variables.ssl_port, json_printer) diff --git a/tests/gold_tests/headers/field_name_space.test.py b/tests/gold_tests/headers/field_name_space.test.py index 559ba17b6a4..d5ae3dd39c4 100644 --- a/tests/gold_tests/headers/field_name_space.test.py +++ b/tests/gold_tests/headers/field_name_space.test.py @@ -1,5 +1,5 @@ ''' -Test on handeling spaces after the field name and before the colon +Test on handling spaces after the field name and before the colon ''' # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file @@ -18,7 +18,7 @@ # limitations under the License. Test.Summary = ''' -Checking on handeling spaces after the field name and before the colon +Checking on handling spaces after the field name and before the colon ''' Test.ContinueOnFail = True diff --git a/tests/gold_tests/headers/forwarded.test.py b/tests/gold_tests/headers/forwarded.test.py index 845231f15ac..5478c5f7c2f 100644 --- a/tests/gold_tests/headers/forwarded.test.py +++ b/tests/gold_tests/headers/forwarded.test.py @@ -179,7 +179,7 @@ def TestHttp1_1(host): TestHttp1_1('www.forwarded-for.com') -# Note: forwaded-obsersver.py counts on the "by" tests being done in the order below. +# Note: forwarded-observer.py counts on the "by" tests being done in the order below. TestHttp1_1('www.forwarded-by-ip.com') TestHttp1_1('www.forwarded-by-unknown.com') diff --git a/tests/gold_tests/logging/all_headers_sanitizer.py b/tests/gold_tests/logging/all_headers_sanitizer.py index c7580394bd0..a4ee5706b38 100644 --- a/tests/gold_tests/logging/all_headers_sanitizer.py +++ b/tests/gold_tests/logging/all_headers_sanitizer.py @@ -38,7 +38,7 @@ rexl.append((re.compile(r'\{"359670651[^"]*"\}'), '{"{359670651__WEIRD__}"}')) rexl.append((re.compile(r'\{\{Accept-Ranges\}:\{bytes\}\}'), '')) -# Loop until the file specified in argv[1] becomes availble +# Loop until the file specified in argv[1] becomes available filename = sys.argv[1] processed = False # Give up looking for file after 2 minutes diff --git a/tests/gold_tests/logging/all_headers_sanitizer.sh b/tests/gold_tests/logging/all_headers_sanitizer.sh index fbe00e06e25..e6cd3ee8aa6 100644 --- a/tests/gold_tests/logging/all_headers_sanitizer.sh +++ b/tests/gold_tests/logging/all_headers_sanitizer.sh @@ -17,7 +17,7 @@ sed 's/ ___FS___ /\ /g' | sed 's/^{//' | sed 's/}$//' | while read LN do - # For lines that contain a full set of messaage headers, get + # For lines that contain a full set of message headers, get # individual headers on separate lines, then sort the lines. # echo $LN | sed 's/}}/}}\ diff --git a/tests/gold_tests/logging/log_retention.test.py b/tests/gold_tests/logging/log_retention.test.py index d90eaddf71a..981af771e92 100644 --- a/tests/gold_tests/logging/log_retention.test.py +++ b/tests/gold_tests/logging/log_retention.test.py @@ -20,7 +20,7 @@ import os Test.Summary = ''' -Test the enforcment of proxy.config.log.max_space_mb_for_logs. +Test the enforcement of proxy.config.log.max_space_mb_for_logs. ''' # This test is sensitive to timing issues, especially in the OS CI for some diff --git a/tests/gold_tests/logging/sigusr2.test.py b/tests/gold_tests/logging/sigusr2.test.py index cc01166e83b..a02c302dc07 100644 --- a/tests/gold_tests/logging/sigusr2.test.py +++ b/tests/gold_tests/logging/sigusr2.test.py @@ -131,7 +131,7 @@ def get_sigusr2_signal_command(self): rotate_manager_log = tr1.Processes.Process("rotate_manager_log", "mv {} {}".format( diags_test.manager_log, diags_test.rotated_manager_log)) -# Configure the signaling of SIGUSR2 to traffic_manaager. +# Configure the signaling of SIGUSR2 to traffic_manager. tr1.Processes.Default.Command = diags_test.get_sigusr2_signal_command() tr1.Processes.Default.Return = 0 tr1.Processes.Default.Ready = When.FileExists(diags_test.diags_log) @@ -178,7 +178,7 @@ def get_sigusr2_signal_command(self): # only allow us to wait until the logs get populated with the desired content, # the test will not wait the entire time for them to complete. first_curl_ready = tr2.Processes.Process("first_curl_ready", 'sleep 30') -# In the autest enironment, it can take more than 10 seconds for the log file to be created. +# In the autest environment, it can take more than 10 seconds for the log file to be created. first_curl_ready.StartupTimeout = 30 first_curl_ready.Ready = When.FileContains(configured_test.configured_log, "/first") @@ -190,7 +190,7 @@ def get_sigusr2_signal_command(self): 'curl "http://127.0.0.1:{0}/second" --verbose'.format(configured_test.ts.Variables.port)) second_curl_ready = tr2.Processes.Process("second_curl_ready", 'sleep 30') -# In the autest enironment, it can take more than 10 seconds for the log file to be created. +# In the autest environment, it can take more than 10 seconds for the log file to be created. second_curl_ready.StartupTimeout = 30 second_curl_ready.Ready = When.FileContains(configured_test.rotated_configured_log, "/second") @@ -203,7 +203,7 @@ def get_sigusr2_signal_command(self): "third_curl", 'curl "http://127.0.0.1:{0}/third" --verbose'.format(configured_test.ts.Variables.port)) third_curl_ready = tr2.Processes.Process("third_curl_ready", 'sleep 30') -# In the autest enironment, it can take more than 10 seconds for the log file to be created. +# In the autest environment, it can take more than 10 seconds for the log file to be created. third_curl_ready.StartupTimeout = 30 third_curl_ready.Ready = When.FileContains(configured_test.configured_log, "/third") diff --git a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py index afb71125acd..618094e442b 100644 --- a/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py +++ b/tests/gold_tests/pluginTest/cache_range_requests/cache_range_requests.test.py @@ -350,7 +350,7 @@ tr.StillRunningAfter = server # 11 Test - cache_key_url request -- deprecated -tr = Test.AddTestRun("cache_key_url request - dprecated") +tr = Test.AddTestRun("cache_key_url request - deprecated") ps = tr.Processes.Default ps.Command = curl_and_args + ' http://psd/path -r {} -H "uuid: pselect"'.format(pselect_str) ps.ReturnCode = 0 diff --git a/tests/gold_tests/pluginTest/compress/compress.test.py b/tests/gold_tests/pluginTest/compress/compress.test.py index 245c0651eee..54a68181590 100644 --- a/tests/gold_tests/pluginTest/compress/compress.test.py +++ b/tests/gold_tests/pluginTest/compress/compress.test.py @@ -148,7 +148,7 @@ def curl_post(ts, idx, encodingList): tr.Processes.Default.ReturnCode = 0 tr.Processes.Default.Command = curl(ts, i, "deflate") -# Test Aceept-Encoding normalization. +# Test Accept-Encoding normalization. tr = Test.AddTestRun() tr.Processes.Default.ReturnCode = 0 @@ -194,7 +194,7 @@ def curl_post(ts, idx, encodingList): # compress_long.log contains all the output from the curl commands. The tr removes the carriage returns for easier # readability. Curl seems to have a bug, where it will neglect to output an end of line before outputing an HTTP # message header line. The sed command is a work-around for this problem. greplog.sh uses the grep command to -# select HTTP request/response line that should be consitent every time the test runs. +# select HTTP request/response line that should be consistent every time the test runs. # tr = Test.AddTestRun() tr.Processes.Default.ReturnCode = 0 diff --git a/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py b/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py index d22f8106c71..55c60226687 100644 --- a/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py +++ b/tests/gold_tests/pluginTest/cookie_remap/regexcookie.test.py @@ -22,7 +22,7 @@ ''' Test.SkipUnless(Condition.PluginExists('cookie_remap.so')) Test.ContinueOnFail = True -Test.testName = "cookie_remap: cookie regex match and substition" +Test.testName = "cookie_remap: cookie regex match and substitution" # Define default ATS ts = Test.MakeATSProcess("ts") diff --git a/tests/gold_tests/pluginTest/esi/esi.test.py b/tests/gold_tests/pluginTest/esi/esi.test.py index e81450b5b3c..8bfdc4b55a1 100644 --- a/tests/gold_tests/pluginTest/esi/esi.test.py +++ b/tests/gold_tests/pluginTest/esi/esi.test.py @@ -223,7 +223,7 @@ def run_cases_expecting_gzip(self): zipped_body_disk_file.Exists = True # Now, unzip the file and make sure its size is the expected body. - tr = Test.AddTestRun("Verify the file uzips to the expected body.") + tr = Test.AddTestRun("Verify the file unzips to the expected body.") tr.Processes.Default.Command = "gunzip {}".format(gzipped_body_file) tr.Processes.Default.Ready = When.FileExists(unzipped_body_file) tr.Processes.Default.ReturnCode = 0 @@ -252,7 +252,7 @@ def run_cases_expecting_gzip(self): gz_disk_file.Size = Testers.GreaterThan(0) # Now, unzip the file and make sure its size is the original 0 size body. - tr = Test.AddTestRun("Verify the file uzips to a zero sized file.") + tr = Test.AddTestRun("Verify the file unzips to a zero sized file.") tr.Processes.Default.Command = "gunzip {}".format(gzipped_empty_body) tr.Processes.Default.Ready = When.FileExists(empty_body_file) tr.Processes.Default.ReturnCode = 0 diff --git a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py index 3db076e623c..b037051f7cf 100644 --- a/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py +++ b/tests/gold_tests/pluginTest/regex_revalidate/regex_revalidate.test.py @@ -132,7 +132,7 @@ path1_rule = 'path1 {}\n'.format(int(time.time()) + 600) -# Define first revistion for when trafficserver starts +# Define first revision for when trafficserver starts ts.Disk.File(regex_revalidate_conf_path, typename="ats:config").AddLines([ "# Empty\n" ]) diff --git a/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py b/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py index 5988fd9c9a0..9d3ca27682e 100644 --- a/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py +++ b/tests/gold_tests/pluginTest/slice/slice_selfhealing.test.py @@ -178,7 +178,7 @@ ps.Streams.stdout.Content = Testers.ContainsExpression("etagnew", "expected etagnew") tr.StillRunningAfter = ts -# 3 Test - Request fullly healed asset via slice plugin +# 3 Test - Request fully healed asset via slice plugin tr = Test.AddTestRun("Request full healed slice") ps = tr.Processes.Default ps.Command = curl_and_args + ' http://slice/second' diff --git a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py index 223c25aa2a0..c70b7145416 100644 --- a/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py +++ b/tests/gold_tests/pluginTest/traffic_dump/traffic_dump.test.py @@ -247,7 +247,7 @@ tr.StillRunningAfter = ts # -# Test 6: Verify correct protcol dumping of a TLS connection. +# Test 6: Verify correct protocol dumping of a TLS connection. # tr = Test.AddTestRun("Verify the client protocol stack of a TLS session.") https_protocols = "tls,tcp,ip" @@ -278,7 +278,7 @@ tr.StillRunningAfter = ts # -# Test 7: Verify correct protcol dumping of TLS and HTTP/2 connections. +# Test 7: Verify correct protocol dumping of TLS and HTTP/2 connections. # tr = Test.AddTestRun("Verify the client HTTP/2 protocol stack.") h2_protocols = "http,tls,tcp,ip" @@ -308,7 +308,7 @@ tr.StillRunningAfter = ts # -# Test 8: Verify correct protcol dumping of client-side TLS and server-side HTTP. +# Test 8: Verify correct protocol dumping of client-side TLS and server-side HTTP. # tr = Test.AddTestRun("Verify the client TLS protocol stack.") tr.Setup.CopyAs(verify_replay, Test.RunDirectory) diff --git a/tests/gold_tests/post_slow_server/check.sh b/tests/gold_tests/post_slow_server/check.sh index 4d5f189d183..b905ed8075b 100755 --- a/tests/gold_tests/post_slow_server/check.sh +++ b/tests/gold_tests/post_slow_server/check.sh @@ -21,7 +21,7 @@ let RECEIVED=8*RECEIVED EXPECTED=$((200 * 1024)) -echo "Exepcted=$EXPECTED" -echo "Recieved=$RECEIVED" +echo "Expected=$EXPECTED" +echo "Received=$RECEIVED" (( RECEIVED == EXPECTED )) diff --git a/tests/gold_tests/redirect/redirect_actions.test.py b/tests/gold_tests/redirect/redirect_actions.test.py index 1b294033928..5c1f49e481f 100644 --- a/tests/gold_tests/redirect/redirect_actions.test.py +++ b/tests/gold_tests/redirect/redirect_actions.test.py @@ -169,7 +169,7 @@ class AddressE(Enum): Classes of addresses are mapped to example addresses. ''' Private = ('10.0.0.1', '[fc00::1]') - Loopback = (['127.1.2.3']) # [::1] is ommitted here because it is likely overwritten by Self, and there are no others in IPv6. + Loopback = (['127.1.2.3']) # [::1] is omitted here because it is likely overwritten by Self, and there are no others in IPv6. Multicast = ('224.1.2.3', '[ff42::]') Linklocal = ('169.254.0.1', '[fe80::]') Routable = ('72.30.35.10', '[2001:4998:58:1836::10]') # Do not Follow redirects to these in an automated test. diff --git a/tests/gold_tests/timeout/tls_conn_timeout.test.py b/tests/gold_tests/timeout/tls_conn_timeout.test.py index 8493243cdec..86da7ecc4ee 100644 --- a/tests/gold_tests/timeout/tls_conn_timeout.test.py +++ b/tests/gold_tests/timeout/tls_conn_timeout.test.py @@ -75,12 +75,12 @@ tr.StillRunningAfter = Test.Processes.ts # Should not catch the connect timeout. Even though the first bytes are not sent until after the 2 second connect timeout -# Shoudl not retry the connection +# Should not retry the connection tr = Test.AddTestRun("tr-delayed-post") tr.Processes.Default.StartBefore(delay_post_ttfb, ready=When.PortOpen(Test.Variables.block_ttfb_port)) tr.Processes.Default.Command = 'curl -H"Connection:close" -d "bob" -i http://127.0.0.1:{0}/ttfb_blocked --tlsv1.2'.format( ts.Variables.port) -tr.Processes.Default.Streams.All = Testers.ContainsExpression("504 Connection Timed Out", "Conntect timeout") +tr.Processes.Default.Streams.All = Testers.ContainsExpression("504 Connection Timed Out", "Connect timeout") tr.Processes.Default.ReturnCode = 0 tr.StillRunningAfter = delay_post_ttfb @@ -103,7 +103,7 @@ tr.Processes.Default.StartBefore(delay_get_ttfb, ready=When.PortOpen(Test.Variables.get_block_ttfb_port)) tr.Processes.Default.Command = 'curl -H"Connection:close" -i http://127.0.0.1:{0}/get_ttfb_blocked --tlsv1.2'.format( ts.Variables.port) -tr.Processes.Default.Streams.All = Testers.ContainsExpression("504 Connection Timed Out", "Conntect timeout") +tr.Processes.Default.Streams.All = Testers.ContainsExpression("504 Connection Timed Out", "Connect timeout") tr.Processes.Default.ReturnCode = 0 tr.StillRunningAfter = delay_get_ttfb diff --git a/tests/gold_tests/tls/tls_client_verify.test.py b/tests/gold_tests/tls/tls_client_verify.test.py index f4b66a8e59b..baaf04788f6 100644 --- a/tests/gold_tests/tls/tls_client_verify.test.py +++ b/tests/gold_tests/tls/tls_client_verify.test.py @@ -53,7 +53,7 @@ 'dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key' ) -# Just map everything through to origin. This test is concentratign on the user-agent side +# Just map everything through to origin. This test is concentrating on the user-agent side ts.Disk.remap_config.AddLine( 'map / http://127.0.0.1:{0}/'.format(server.Variables.Port) ) diff --git a/tests/gold_tests/tls/tls_client_verify2.test.py b/tests/gold_tests/tls/tls_client_verify2.test.py index 5168cd7db47..98f0d2e1f70 100644 --- a/tests/gold_tests/tls/tls_client_verify2.test.py +++ b/tests/gold_tests/tls/tls_client_verify2.test.py @@ -51,7 +51,7 @@ 'dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key' ) -# Just map everything through to origin. This test is concentratign on the user-agent side +# Just map everything through to origin. This test is concentrating on the user-agent side ts.Disk.remap_config.AddLine( 'map / http://127.0.0.1:{0}/'.format(server.Variables.Port) ) diff --git a/tests/gold_tests/tls/tls_client_versions.test.py b/tests/gold_tests/tls/tls_client_versions.test.py index 8f1085a51a5..cd46ec0d8cf 100644 --- a/tests/gold_tests/tls/tls_client_versions.test.py +++ b/tests/gold_tests/tls/tls_client_versions.test.py @@ -21,7 +21,7 @@ ''' # By default only offer TLSv1_2 -# for special doman foo.com only offer TLSv1 and TLSv1_1 +# for special domain foo.com only offer TLSv1 and TLSv1_1 Test.SkipUnless( Condition.HasOpenSSLVersion("1.1.1") @@ -39,7 +39,7 @@ ts.addSSLfile("ssl/server.pem") ts.addSSLfile("ssl/server.key") -# Need no remap rules. Everything should be proccessed by sni +# Need no remap rules. Everything should be processed by sni # Make sure the TS server certs are different from the origin certs ts.Disk.ssl_multicert_config.AddLine( diff --git a/tests/gold_tests/tls/tls_forward_nonhttp.test.py b/tests/gold_tests/tls/tls_forward_nonhttp.test.py index 7034b9d9450..d3bd6a8b5fb 100644 --- a/tests/gold_tests/tls/tls_forward_nonhttp.test.py +++ b/tests/gold_tests/tls/tls_forward_nonhttp.test.py @@ -35,7 +35,7 @@ nameserver = Test.MakeDNServer("dns", default='127.0.0.1') -# Need no remap rules. Everything should be proccessed by sni +# Need no remap rules. Everything should be processed by sni # Make sure the TS server certs are different from the origin certs ts.Disk.ssl_multicert_config.AddLine( diff --git a/tests/gold_tests/tls/tls_partial_blind_tunnel.test.py b/tests/gold_tests/tls/tls_partial_blind_tunnel.test.py index 93a7bae0ec3..1e3ad41cca8 100644 --- a/tests/gold_tests/tls/tls_partial_blind_tunnel.test.py +++ b/tests/gold_tests/tls/tls_partial_blind_tunnel.test.py @@ -33,7 +33,7 @@ ts.addSSLfile("ssl/signed-bar.key") ts.addSSLfile("ssl/signer.pem") -# Need no remap rules. Everything should be proccessed by sni +# Need no remap rules. Everything should be processed by sni # Make sure the TS server certs are different from the origin certs ts.Disk.ssl_multicert_config.AddLine( diff --git a/tests/gold_tests/tls/tls_sni_host_policy.test.py b/tests/gold_tests/tls/tls_sni_host_policy.test.py index a05b1da4b13..ff4be60a203 100644 --- a/tests/gold_tests/tls/tls_sni_host_policy.test.py +++ b/tests/gold_tests/tls/tls_sni_host_policy.test.py @@ -51,7 +51,7 @@ 'dest_ip=* ssl_cert_name=server.pem ssl_key_name=server.key' ) -# Just map everything through to origin. This test is concentratign on the user-agent side +# Just map everything through to origin. This test is concentrating on the user-agent side ts.Disk.remap_config.AddLine( 'map / http://127.0.0.1:{0}/'.format(server.Variables.Port) ) diff --git a/tests/gold_tests/tls/tls_tunnel.test.py b/tests/gold_tests/tls/tls_tunnel.test.py index c9aff54db99..bcf7cc94681 100644 --- a/tests/gold_tests/tls/tls_tunnel.test.py +++ b/tests/gold_tests/tls/tls_tunnel.test.py @@ -47,7 +47,7 @@ dns.addRecords(records={"localhost": ["127.0.0.1"]}) dns.addRecords(records={"one.testmatch": ["127.0.0.1"]}) dns.addRecords(records={"two.example.one": ["127.0.0.1"]}) -# Need no remap rules. Everything should be proccessed by sni +# Need no remap rules. Everything should be processed by sni # Make sure the TS server certs are different from the origin certs ts.Disk.ssl_multicert_config.AddLine( @@ -189,7 +189,7 @@ trreload.Processes.Default.Env = ts.Env trreload.Processes.Default.ReturnCode = 0 -# Should termimate on traffic_server (not tunnel) +# Should terminate on traffic_server (not tunnel) tr = Test.AddTestRun("foo.com no Tunnel-test") tr.StillRunningAfter = ts # Wait for the reload to complete by running the sni_reload_done test diff --git a/tests/gold_tests/tls/tls_tunnel_forward.test.py b/tests/gold_tests/tls/tls_tunnel_forward.test.py index a61a6463b43..e7c791a93ff 100644 --- a/tests/gold_tests/tls/tls_tunnel_forward.test.py +++ b/tests/gold_tests/tls/tls_tunnel_forward.test.py @@ -48,7 +48,7 @@ ts.addSSLfile("ssl/signer.pem") ts.addSSLfile("ssl/signer.key") -# Need no remap rules. Everything should be proccessed by sni +# Need no remap rules. Everything should be processed by sni # Make sure the TS server certs are different from the origin certs ts.Disk.ssl_multicert_config.AddLine( diff --git a/tests/gold_tests/tls/tls_verify_ca_override.test.py b/tests/gold_tests/tls/tls_verify_ca_override.test.py index c4b3e5d0a8f..b85860febd8 100644 --- a/tests/gold_tests/tls/tls_verify_ca_override.test.py +++ b/tests/gold_tests/tls/tls_verify_ca_override.test.py @@ -88,7 +88,7 @@ }) # Should succeed -tr = Test.AddTestRun("Use corrcect ca bundle for server 1") +tr = Test.AddTestRun("Use correct ca bundle for server 1") tr.Processes.Default.Command = 'curl -k -H \"host: foo.com\" http://127.0.0.1:{0}/case1'.format(ts.Variables.port) tr.ReturnCode = 0 tr.Setup.Copy("ssl/signed-foo.key") @@ -99,7 +99,7 @@ tr.Processes.Default.StartBefore(Test.Processes.ts) tr.StillRunningAfter = server1 tr.StillRunningAfter = ts -# Should succed. No message +# Should succeed. No message tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded") tr2 = Test.AddTestRun("Use incorrect ca bundle for server 1") @@ -110,7 +110,7 @@ # Should succeed, but will be message in log about name mismatch tr2.Processes.Default.Streams.stdout = Testers.ContainsExpression("Could Not Connect", "Curl attempt should have succeeded") -tr2 = Test.AddTestRun("Use currect ca bundle for server 2") +tr2 = Test.AddTestRun("Use correct ca bundle for server 2") tr2.Processes.Default.Command = "curl -k -H \"host: random.com\" http://127.0.0.1:{0}/case2".format(ts.Variables.port) tr2.ReturnCode = 0 tr2.StillRunningAfter = server2 diff --git a/tests/gold_tests/tls/tls_verify_override.test.py b/tests/gold_tests/tls/tls_verify_override.test.py index a47fe23d2f1..8e906d38567 100644 --- a/tests/gold_tests/tls/tls_verify_override.test.py +++ b/tests/gold_tests/tls/tls_verify_override.test.py @@ -141,7 +141,7 @@ tr.Processes.Default.StartBefore(Test.Processes.ts) tr.StillRunningAfter = server tr.StillRunningAfter = ts -# Should succed. No message +# Should succeed. No message tr.Processes.Default.Streams.All = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded") tr.Processes.Default.Streams.All += Testers.ContainsExpression("200 OK", "Curl attempt should have succeeded") @@ -261,7 +261,7 @@ # name check failure for random.com ts.Disk.diags_log.Content += Testers.ContainsExpression( r"WARNING: SNI \(random.com\) not in certificate. Action=Continue server=random.com\(127.0.0.1\)", - "Warning on missing name for randome.com") + "Warning on missing name for random.com") # name check failure for bar.com ts.Disk.diags_log.Content += Testers.ContainsExpression( r"WARNING: SNI \(bar.com\) not in certificate. Action=Terminate server=bar.com\(127.0.0.1\)", diff --git a/tests/gold_tests/tls/tls_verify_override_base.test.py b/tests/gold_tests/tls/tls_verify_override_base.test.py index f16de5c1fcf..1274185ea92 100644 --- a/tests/gold_tests/tls/tls_verify_override_base.test.py +++ b/tests/gold_tests/tls/tls_verify_override_base.test.py @@ -135,7 +135,7 @@ tr.Processes.Default.StartBefore(Test.Processes.ts) tr.StillRunningAfter = server tr.StillRunningAfter = ts -# Should succed. No message +# Should succeed. No message tr.Processes.Default.Streams.stdout = Testers.ExcludesExpression("Could Not Connect", "Curl attempt should have succeeded") tr2 = Test.AddTestRun("default-permissive-fail") @@ -249,7 +249,7 @@ # name check failure for random.com ts.Disk.diags_log.Content += Testers.ContainsExpression( r"WARNING: SNI \(random.com\) not in certificate. Action=Continue server=127.0.0.1\(127.0.0.1\)", - "Warning on missing name for randome.com") + "Warning on missing name for random.com") # name check failure for bar.com ts.Disk.diags_log.Content += Testers.ContainsExpression( r"WARNING: SNI \(bar.com\) not in certificate. Action=Terminate server=bar.com\(127.0.0.1\)",