aboutsummaryrefslogtreecommitdiffstats
path: root/container-core/src/test
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-05-07 16:26:06 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-05-07 16:26:06 +0200
commit0e9a1332b1ec69bdfbffc698a2792e35eebd38f0 (patch)
tree66c3cfa0b59b61e580ea368451e899c7c0e1a877 /container-core/src/test
parent811a5217c3685d1899f6cc51e1255e167e2ffa0a (diff)
Success with no content is allowed on failure
Diffstat (limited to 'container-core/src/test')
-rw-r--r--container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java16
1 files changed, 8 insertions, 8 deletions
diff --git a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
index 825e3eba110..2183098da2b 100644
--- a/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
+++ b/container-core/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java
@@ -169,7 +169,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestNondeterministicExceptionWithSyncHandleResponse() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError()))
.execute();
}
@@ -232,7 +232,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentWriteWithNondeterministicSyncFailure() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError()))
.execute();
}
@@ -253,7 +253,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentWriteWithNondeterministicAsyncFailure() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError()))
.execute();
}
@@ -281,7 +281,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentWriteNondeterministicException() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError(), successNoContent()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError(), successNoContent()))
.execute();
}
@@ -309,7 +309,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentWriteNondeterministicExceptionWithSyncCompletion() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError()))
.execute();
}
@@ -394,7 +394,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentWriteExceptionWithNondeterministicAsyncFailure() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError()))
.execute();
}
@@ -520,7 +520,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentCloseNondeterministicExceptionWithSyncCompletion() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError(), successNoContent()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError(), successNoContent()))
.execute();
}
@@ -548,7 +548,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest {
@Override
@Test
public void testRequestContentCloseNondeterministicExceptionWithAsyncCompletion() throws Throwable {
- new TestRunner().expect(anyOf(success(), serverError(), successNoContent()))
+ new TestRunner().expect(anyOf(success(), successNoContent(), serverError(), successNoContent()))
.execute();
}