diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-02-06 13:57:21 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-02-06 13:57:21 +0100 |
commit | 222b7fe944ecb282ec6502d00a025b75bd2b45b0 (patch) | |
tree | 4d4acac8d371f2c1d574b73a2cce67a4b79bb426 /configserver | |
parent | 443768b659684622310708e4e110d381e5a9b3ff (diff) |
Simplify and log at debug level
Diffstat (limited to 'configserver')
-rw-r--r-- | configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java | 3 | ||||
-rw-r--r-- | configserver/src/test/java/com/yahoo/vespa/config/server/MockTesterClient.java | 74 |
2 files changed, 23 insertions, 54 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java index 8c49d86243f..67549672408 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/http/TesterClient.java @@ -59,8 +59,7 @@ public class TesterClient { } private HttpResponse execute(HttpUriRequest request, String messageIfRequestFails) { - // TODO: Change log level to DEBUG - logger.log(LogLevel.INFO, "Sending request to tester container " + request.getURI().toString()); + logger.log(LogLevel.DEBUG, "Sending request to tester container " + request.getURI().toString()); try { return new ProxyResponse(httpClient.execute(request)); } catch (IOException e) { diff --git a/configserver/src/test/java/com/yahoo/vespa/config/server/MockTesterClient.java b/configserver/src/test/java/com/yahoo/vespa/config/server/MockTesterClient.java index db687857dae..c835bb29ec0 100644 --- a/configserver/src/test/java/com/yahoo/vespa/config/server/MockTesterClient.java +++ b/configserver/src/test/java/com/yahoo/vespa/config/server/MockTesterClient.java @@ -15,70 +15,40 @@ public class MockTesterClient extends TesterClient { @Override public HttpResponse getStatus(String testerHostname, int port) { - return new MockStatusResponse(); + return new HttpResponse(200) { + @Override + public void render(OutputStream outputStream) throws IOException { + outputStream.write("OK".getBytes(StandardCharsets.UTF_8)); + } + }; } @Override public HttpResponse getLog(String testerHostname, int port, Long after) { - return new MockLogResponse(); + return new HttpResponse(200) { + @Override + public void render(OutputStream outputStream) throws IOException { + outputStream.write("log".getBytes(StandardCharsets.UTF_8)); + } + }; } @Override public HttpResponse startTests(String testerHostname, int port, String suite, byte[] config) { - return new MockStartTestsResponse(); + return new HttpResponse(200) { + @Override + public void render(OutputStream outputStream) { } + }; } @Override public HttpResponse isTesterReady(String testerHostname, int port) { - return new MockTesterReadyResponse(); - } - - private static class MockStatusResponse extends HttpResponse { - - private MockStatusResponse() { - super(200); - } - - @Override - public void render(OutputStream outputStream) throws IOException { - outputStream.write("OK".getBytes(StandardCharsets.UTF_8)); - } - - } - - private static class MockLogResponse extends HttpResponse { - - private MockLogResponse() { - super(200); - } - - @Override - public void render(OutputStream outputStream) throws IOException { - outputStream.write("log".getBytes(StandardCharsets.UTF_8)); - } - - } - - private static class MockStartTestsResponse extends HttpResponse { - - private MockStartTestsResponse() { - super(200); - } - - @Override - public void render(OutputStream outputStream) { } - - } - - private static class MockTesterReadyResponse extends HttpResponse { - - private MockTesterReadyResponse() { - super(200); - } - - @Override - public void render(OutputStream outputStream) { } - + return new HttpResponse(200) { + @Override + public void render(OutputStream outputStream) throws IOException { + outputStream.write("{ \"message\": \"OK\" } ".getBytes(StandardCharsets.UTF_8)); + } + }; } } |