From 0fae221afab80dda2373bb6bf21ef58b142b957e Mon Sep 17 00:00:00 2001 From: Lachlan Roberts Date: Wed, 19 Aug 2020 21:27:04 +1000 Subject: [PATCH] Issue #5105 - fix GracefulStopTest expectations from 503s to 404s StatisticsHandler no longer gives 503 responses after shutdown. Signed-off-by: Lachlan Roberts --- .../java/org/eclipse/jetty/server/GracefulStopTest.java | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java b/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java index 6cd9a8b7548e..10fd5d12cbc8 100644 --- a/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java +++ b/jetty-server/src/test/java/org/eclipse/jetty/server/GracefulStopTest.java @@ -305,7 +305,7 @@ public void run() ).getBytes()); client2.getOutputStream().flush(); String response2 = IO.toString(client2.getInputStream()); - assertThat(response2, containsString(" 503 ")); + assertThat(response2, containsString(" 404 ")); now = TimeUnit.NANOSECONDS.toMillis(System.nanoTime()); Thread.sleep(Math.max(1, end - now)); @@ -330,8 +330,9 @@ public void run() assertThat(response, containsString(" 200 OK")); assertThat(response, containsString("read 10/10")); - assertThat(stats.getRequests(), is(2)); - assertThat(stats.getResponses5xx(), is(1)); + // The StatisticsHandler was shutdown when it received the second request so does not contribute to the stats. + assertThat(stats.getRequests(), is(1)); + assertThat(stats.getResponses4xx(), is(0)); } } @@ -631,7 +632,7 @@ public void handle(String target, Request baseRequest, HttpServletRequest reques // Check new connections rejected! String unavailable = connector.getResponse("GET / HTTP/1.1\r\nHost:localhost\r\n\r\n"); - assertThat(unavailable, containsString(" 503 Service Unavailable")); + assertThat(unavailable, containsString(" 404 Not Found")); assertThat(unavailable, Matchers.containsString("Connection: close")); // Check completed 200 has close