diff options
| author | Eric Wong <BOFH@YHBT.net> | 2023-09-10 19:37:32 +0000 |
|---|---|---|
| committer | Eric Wong <BOFH@YHBT.net> | 2023-09-10 19:55:18 +0000 |
| commit | 7160f1b519aece0fe645d22a7d8fb954a43ad6fb (patch) | |
| tree | 2d25aaed01630399106a801acf844d15644e641b | |
| parent | b588ccbbf73547487f54fd1a9d5396d6848e8661 (diff) | |
| download | unicorn-7160f1b519aece0fe645d22a7d8fb954a43ad6fb.tar.gz | |
Less Ruby means fewer incompatibilities to worry about with every new version.
| -rw-r--r-- | t/integration.ru | 1 | ||||
| -rw-r--r-- | t/integration.t | 6 | ||||
| -rw-r--r-- | test/unit/test_server.rb | 14 |
3 files changed, 7 insertions, 14 deletions
diff --git a/t/integration.ru b/t/integration.ru index 086126a..888833a 100644 --- a/t/integration.ru +++ b/t/integration.ru @@ -98,6 +98,7 @@ run(lambda do |env| when '/pid'; [ 200, {}, [ "#$$\n" ] ] when '/early_hints_rack2'; early_hints(env, "r\n2") when '/early_hints_rack3'; early_hints(env, %w(r 3)) + when '/broken_app'; raise RuntimeError, 'hello' else '/'; [ 200, {}, [ env_dump(env) ] ] end # case PATH_INFO (GET) when 'POST' diff --git a/t/integration.t b/t/integration.t index bea221c..ba17dd9 100644 --- a/t/integration.t +++ b/t/integration.t @@ -118,6 +118,12 @@ SKIP: { is_deeply([grep(/^X-Nil:/, @$hdr)], ['X-Nil: '], 'nil header value accepted for broken apps') or diag(explain($hdr)); +check_stderr; +($status, $hdr, $bdy) = do_req($srv, 'GET /broken_app HTTP/1.0'); +like($status, qr!\AHTTP/1\.[0-1] 500\b!, 'got 500 error on broken endpoint'); +is($bdy, undef, 'no response body after exception'); +truncate($errfh, 0); + my $ck_early_hints = sub { my ($note) = @_; $c = unix_start($u1, 'GET /early_hints_rack2 HTTP/1.0'); diff --git a/test/unit/test_server.rb b/test/unit/test_server.rb index 0a710d1..2af12ea 100644 --- a/test/unit/test_server.rb +++ b/test/unit/test_server.rb @@ -127,20 +127,6 @@ class WebServerTest < Test::Unit::TestCase sock.close end - def test_broken_app - teardown - app = lambda { |env| raise RuntimeError, "hello" } - # [200, {}, []] } - redirect_test_io do - @server = HttpServer.new(app, :listeners => [ "127.0.0.1:#@port"] ) - @server.start - end - sock = tcp_socket('127.0.0.1', @port) - sock.syswrite("GET / HTTP/1.0\r\n\r\n") - assert_match %r{\AHTTP/1.[01] 500\b}, sock.sysread(4096) - assert_nil sock.close - end - def test_simple_server results = hit(["http://localhost:#{@port}/test"]) assert_equal 'hello!\n', results[0], "Handler didn't really run" |