summaryrefslogtreecommitdiffstats
path: root/configserver
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-10-24 09:32:02 +0200
committerolaaun <olaa@oath.com>2018-10-24 09:32:02 +0200
commit0de9e3aa1150edcad532a6237d7cc6d2c69d1f51 (patch)
treefa9ed0540683540aa09423e219bebc49dd6d4549 /configserver
parent4fee3c3009cdfa4af69e2e4ca9d414a6fca47f8f (diff)
Use dynamic port (#7430)
Diffstat (limited to 'configserver')
-rw-r--r--configserver/src/test/java/com/yahoo/vespa/config/server/http/LogRetrieverTest.java10
1 files changed, 5 insertions, 5 deletions
diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/http/LogRetrieverTest.java b/configserver/src/test/java/com/yahoo/vespa/config/server/http/LogRetrieverTest.java
index 738903910f3..a2c63047878 100644
--- a/configserver/src/test/java/com/yahoo/vespa/config/server/http/LogRetrieverTest.java
+++ b/configserver/src/test/java/com/yahoo/vespa/config/server/http/LogRetrieverTest.java
@@ -21,11 +21,10 @@ import static org.junit.Assert.assertEquals;
public class LogRetrieverTest {
- private String logServerHostName = "http://localhost:8080/";
private LogRetriever logRetriever;
@Rule
- public final WireMockRule wireMock = new WireMockRule(options().port(8080), true);
+ public final WireMockRule wireMock = new WireMockRule(options().dynamicPort(), true);
@Before
public void setup() {
@@ -36,7 +35,8 @@ public class LogRetrieverTest {
public void testThatLogHandlerPropagatesResponseBody() throws IOException {
String expectedBody = "{logs-json}";
stubFor(get(urlEqualTo("/")).willReturn(okJson(expectedBody)));
- HttpResponse response = logRetriever.getLogs(logServerHostName);
+ String logServerUri = "http://localhost:" + wireMock.port() +"/";
+ HttpResponse response = logRetriever.getLogs(logServerUri);
ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream();
response.render(byteArrayOutputStream);
assertEquals(expectedBody, byteArrayOutputStream.toString());
@@ -44,9 +44,9 @@ public class LogRetrieverTest {
}
@Test
- public void testThatNotFoundLogServerReturns404() throws IOException {
+ public void testThatNotFoundLogServerReturns404() {
stubFor(get(urlEqualTo("/")).willReturn(aResponse().withStatus(200)));
- HttpResponse response = logRetriever.getLogs("http://wrong-host:8080/");
+ HttpResponse response = logRetriever.getLogs("http://wrong-host:" + wireMock.port() + "/");
assertEquals(404, response.getStatus());
}