diff options
| author | gjoranv <gjoranv@gmail.com> | 2017-04-18 10:44:51 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-18 10:44:51 +0200 |
| commit | 3c5c151fb804b17c29d1ad1cfa4e090bda820bbb (patch) | |
| tree | 959836e47ea4e077bf36c3267807501570ed64df /jdisc_http_service | |
| parent | 27a4bb405e5a351cfaaaa9c2400b876f92a60f1d (diff) | |
| parent | 19ae6f56729b6935f197da4a8e7dfc80be701311 (diff) | |
Merge pull request #2189 from yahoo/bjorncs/stabilize-jdisc-tests
Allow 200 without content
Diffstat (limited to 'jdisc_http_service')
| -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 09ca633e0f7..0729c4b8480 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 @@ -411,7 +411,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest { @Override @Test public void testRequestContentCloseWithNondeterministicSyncFailure() throws Throwable { - new TestRunner().expect(anyOf(success(), serverError())) + new TestRunner().expect(anyOf(success(), successNoContent(), serverError())) .execute(); } |