fixed merge
This commit is contained in:
parent
8ca8735c95
commit
cadf8cb16f
|
@ -1090,7 +1090,7 @@ public class ProxyServletTest
|
|||
// Make sure there is error page content, as the proxy-to-client response has been reset.
|
||||
InputStream input = listener.getInputStream();
|
||||
String body = IO.toString(input);
|
||||
Assert.assertThat(body,Matchers.containsString("HTTP ERROR: 504"));
|
||||
Assert.assertThat(body,Matchers.containsString("HTTP ERROR 504"));
|
||||
chunk1Latch.countDown();
|
||||
|
||||
// Result succeeds because a 504 is a valid HTTP response.
|
||||
|
|
Loading…
Reference in New Issue