diff options
| author | Håkon Hallingstad <hakon@oath.com> | 2017-11-13 18:20:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-11-13 18:20:13 +0100 |
| commit | 795122be6d0676bbedf99d2413d1db2c2b64098a (patch) | |
| tree | 8aaa7a876e44731902faf99fc60379db6e9447c5 | |
| parent | 55c3bc5d24ee6d2ba7c6d886c10629ae7600199a (diff) | |
| parent | 23bbcd034b7ff805922d62a0d869a5ad5c843295 (diff) | |
Merge pull request #4105 from vespa-engine/bjorncs/bundle-plugin-test
Use com.yahoo.vespa as artifact id of bundle-plugin-test
| -rw-r--r-- | bundle-plugin-test/pom.xml | 2 | ||||
| -rw-r--r-- | jdisc_http_service/src/test/java/com/yahoo/jdisc/http/server/jetty/HttpServerConformanceTest.java | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/bundle-plugin-test/pom.xml b/bundle-plugin-test/pom.xml index 2112d616523..8d8bf48cc07 100644 --- a/bundle-plugin-test/pom.xml +++ b/bundle-plugin-test/pom.xml @@ -10,7 +10,7 @@ <artifactId>parent</artifactId> <version>6-SNAPSHOT</version> </parent> - <groupId>com.yahoo.container.maven.plugin</groupId> + <groupId>com.yahoo.vespa</groupId> <artifactId>bundle-plugin-test</artifactId> <version>6-SNAPSHOT</version> <packaging>container-plugin</packaging> 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 cc7095dadda..632613a79dd 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 @@ -576,7 +576,7 @@ public class HttpServerConformanceTest extends ServerProviderConformanceTest { @Override @Test public void testRequestContentCloseNondeterministicExceptionWithSyncFailure() throws Throwable { - new TestRunner().expect(anyOf(success(), serverError())) + new TestRunner().expect(anyOf(success(), successNoContent(), serverError())) .execute(); } |