diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2020-10-02 15:24:10 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-02 15:24:10 +0200 |
| commit | dea519574f15f763f5b1e5b5eb0cf8875d4733cd (patch) | |
| tree | 32d681312c63987f08d42699554fbeb729584fee | |
| parent | 4e3f493be136274ccbb440b7434f4279283ef5ff (diff) | |
| parent | 7675a8d1812fa690630f44ae0d07562506b50a4d (diff) | |
Merge pull request #14676 from vespa-engine/bjorncs/jdisc-http-service
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.java | 2 |
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 1bf6ef2a598..a239dc1ae23 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 @@ -330,7 +330,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest { @Override @Test public void testRequestContentWriteExceptionAfterResponseCloseNoContentWithSyncCompletion() throws Throwable { - new TestRunner().expect(successNoContent()) + new TestRunner().expect(anyOf(success(), successNoContent())) .execute(); } |