aboutsummaryrefslogtreecommitdiffstats
path: root/container-core
diff options
context:
space:
mode:
authorAmund Bergland Kvalsvik <akvalsvik@verizonmedia.com>2020-06-26 15:31:02 +0200
committerAmund Bergland Kvalsvik <akvalsvik@verizonmedia.com>2020-06-26 15:31:02 +0200
commite3a53542dbff6121488db259959e85965b87600b (patch)
tree0db8693b653d2911dd79962ababeb188aace1709 /container-core
parentce432af28ff6f8f35a25b673665a72f5a48c6266 (diff)
Cleaning up configs, testing is not working
Diffstat (limited to 'container-core')
-rw-r--r--container-core/src/test/java/com/yahoo/container/handler/metrics/MetricsV2HandlerTest.java2
-rw-r--r--container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusHandlerTest.java9
2 files changed, 7 insertions, 4 deletions
diff --git a/container-core/src/test/java/com/yahoo/container/handler/metrics/MetricsV2HandlerTest.java b/container-core/src/test/java/com/yahoo/container/handler/metrics/MetricsV2HandlerTest.java
index b57814e50aa..1e8dccbcd26 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/metrics/MetricsV2HandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/metrics/MetricsV2HandlerTest.java
@@ -60,6 +60,8 @@ public class MetricsV2HandlerTest {
new MetricsProxyApiConfig.Builder()
.metricsPort(wireMockRule.port())
.metricsApiPath(MOCK_METRICS_PATH)
+ .prometheusPort(0)
+ .prometheusApiPath("Not/In/Use")
.build());
testDriver = new RequestHandlerTestDriver(handler);
}
diff --git a/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusHandlerTest.java b/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusHandlerTest.java
index 7bb0e2d72a1..31b21651fdc 100644
--- a/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusHandlerTest.java
+++ b/container-core/src/test/java/com/yahoo/container/handler/metrics/PrometheusHandlerTest.java
@@ -56,10 +56,12 @@ public class PrometheusHandlerTest {
@Before
public void setup() {
setupWireMock();
- var handler = new MetricsV2Handler(Executors.newSingleThreadExecutor(),
+ var handler = new PrometheusHandler(Executors.newSingleThreadExecutor(),
new MetricsProxyApiConfig.Builder()
- .metricsPort(wireMockRule.port())
- .metricsApiPath(MOCK_METRICS_PATH)
+ .prometheusPort(wireMockRule.port())
+ .prometheusApiPath(MOCK_METRICS_PATH)
+ .metricsPort(0)
+ .metricsApiPath("/Not/In/Use")
.build());
testDriver = new RequestHandlerTestDriver(handler);
@@ -89,7 +91,6 @@ public class PrometheusHandlerTest {
assertEquals(VALUES_URI, valuesUri.getString("url"));
}
- @Ignore
@Test
public void visually_inspect_values_response() throws Exception {
String response = testDriver.sendRequest(VALUES_URI).readAll();