summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorn.christian@seime.no>2018-06-08 11:15:16 +0200
committerGitHub <noreply@github.com>2018-06-08 11:15:16 +0200
commit1428af42e5943fbb75497dac5a7f73260bbf5c58 (patch)
tree070495277d3e6264c90d55028a7336fad5f2dfbc
parentfbcd12a89b58ffa85d0374d1085b27b2718f4231 (diff)
parent5d070ce1d80c5e3865b95ae73f8ab4d761893854 (diff)
Merge pull request #6131 from vespa-engine/bjorncs/stabilize-test
Stabilize test - exception may fail out request between commit and re…
-rw-r--r--jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
index 80c1cb8b458..77411fc080e 100644
--- a/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
+++ b/jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
@@ -323,7 +323,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentWriteExceptionAfterResponseWriteWithSyncCompletion() throws Throwable {
- new TestRunner().expect(success())
+ new TestRunner().expect(anyOf(success(), successNoContent()))
.execute();
}