diff options
author | Jeremy Evans <code@jeremyevans.net> | 2023-06-01 08:55:14 -0700 |
---|---|---|
committer | Eric Wong <bofh@yhbt.net> | 2023-06-05 09:17:18 +0000 |
commit | 9d7bab0bc2211b20806d4d0289a7ea992e49a8a1 (patch) | |
tree | 75973762205d106e2a621d0ed12fbb72fba4aa04 /t | |
parent | 5299c3f255dada8605c2cffed9eba1b68d9d42b4 (diff) | |
download | unicorn-9d7bab0bc2211b20806d4d0289a7ea992e49a8a1.tar.gz |
Most changes are to the tests to avoid uppercase characters in header keys, which are no longer allowed in rack 3 (to allow for O(1) access). This also changes a few places where an array of headers was used to switch to a hash, as a hash is requierd in Rack 3. Newer versions of curl use a 000 http_code for invalid http codes, so switch from "42 -eq" to "500 -ne" in the test, as Rack::Lint will always raise a 500 error. There is one test that fails on OpenBSD when opening a fifo. This is unrelated to unicorn as far as I can see, so skip the remaining part of the test in that case on OpenBSD. Tests still pass on Rack 2, and presumably Rack 1 as well, though I didn't test Rack 1. Co-authored-by: Eric Wong <bofh@yhbt.net>
Diffstat (limited to 't')
-rw-r--r-- | t/heartbeat-timeout.ru | 2 | ||||
-rw-r--r-- | t/rack-input-tests.ru | 2 | ||||
-rw-r--r-- | t/t0300-no-default-middleware.sh | 2 | ||||
-rw-r--r-- | t/t0301.ru | 4 | ||||
-rw-r--r-- | t/write-on-close.ru | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/t/heartbeat-timeout.ru b/t/heartbeat-timeout.ru index d9904e8..20a7938 100644 --- a/t/heartbeat-timeout.ru +++ b/t/heartbeat-timeout.ru @@ -1,5 +1,5 @@ use Rack::ContentLength -headers = { 'Content-Type' => 'text/plain' } +headers = { 'content-type' => 'text/plain' } run lambda { |env| case env['PATH_INFO'] when "/block-forever" diff --git a/t/rack-input-tests.ru b/t/rack-input-tests.ru index 8c35630..5459e85 100644 --- a/t/rack-input-tests.ru +++ b/t/rack-input-tests.ru @@ -16,6 +16,6 @@ app = lambda do |env| end while input.read(rand(cap), buf) end - [ 200, {'Content-Type' => 'text/plain'}, [ digest.hexdigest << "\n" ] ] + [ 200, {'content-type' => 'text/plain'}, [ digest.hexdigest << "\n" ] ] end run app diff --git a/t/t0300-no-default-middleware.sh b/t/t0300-no-default-middleware.sh index 779dc02..00feacc 100644 --- a/t/t0300-no-default-middleware.sh +++ b/t/t0300-no-default-middleware.sh @@ -9,7 +9,7 @@ t_begin "setup and start" && { } t_begin "check exit status with Rack::Lint not present" && { - test 42 -eq "$(curl -sf -o/dev/null -w'%{http_code}' http://$listen/)" + test 500 -ne "$(curl -sf -o/dev/null -w'%{http_code}' http://$listen/)" } t_begin "killing succeeds" && { @@ -6,8 +6,8 @@ run(lambda do |env| "lint=#{caller.grep(%r{rack/lint\.rb})[0].split(':')[0]}\n" end h = { - 'Content-Length' => b.size.to_s, - 'Content-Type' => 'text/plain', + 'content-length' => b.size.to_s, + 'content-type' => 'text/plain', } [ 200, h, [ b ] ] end) diff --git a/t/write-on-close.ru b/t/write-on-close.ru index 54a2f2e..725c4d6 100644 --- a/t/write-on-close.ru +++ b/t/write-on-close.ru @@ -8,4 +8,4 @@ class WriteOnClose end end use Rack::ContentType, "text/plain" -run(lambda { |_| [ 200, [%w(Transfer-Encoding chunked)], WriteOnClose.new ] }) +run(lambda { |_| [ 200, { 'transfer-encoding' => 'chunked' }, WriteOnClose.new ] }) |