diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-21 10:38:37 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-06-21 10:38:37 +0200 |
commit | 1c2a36cce3c9ddf4ed64f0be558d2048f75758f9 (patch) | |
tree | bad07ea427619fdd759a3f7d5da2f988f0505bc2 /metrics-proxy/src/test | |
parent | 2561555b135f873352a38e55edbb23912f19a124 (diff) | |
parent | f192b2538c6b751cb9e3266cef70cafb331c3b7f (diff) |
Merge pull request #23138 from vespa-engine/bjorncs/metrics-proxy
Bjorncs/metrics proxy
Diffstat (limited to 'metrics-proxy/src/test')
-rw-r--r-- | metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java | 3 | ||||
-rw-r--r-- | metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java | 7 |
2 files changed, 1 insertions, 9 deletions
diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java index cf6de804053..71a4466ea95 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java @@ -10,7 +10,6 @@ import com.yahoo.jrt.StringValue; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; import com.yahoo.jrt.Transport; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; @@ -43,7 +42,6 @@ public class RpcHealthMetricsTest { public Timeout globalTimeout = Timeout.seconds(300); @Test - @Ignore("Temporarily ignore test until timeout issue is resolved") public void expected_response_is_returned() { try (IntegrationTester tester = new IntegrationTester()) { MockHttpServer mockHttpServer = tester.httpServer(); @@ -69,7 +67,6 @@ public class RpcHealthMetricsTest { } @Test - @Ignore("Temporarily ignore test until timeout issue is resolved") public void non_existent_service_name_returns_an_error_message() { try (IntegrationTester tester = new IntegrationTester()) { String jsonRPCMessage = getHealthMetrics(tester, "non-existing service"); diff --git a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java index 83149ad5ef7..a52e1daf878 100644 --- a/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java +++ b/metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java @@ -14,7 +14,6 @@ import com.yahoo.jrt.StringValue; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; import com.yahoo.jrt.Transport; -import org.junit.Ignore; import org.junit.Rule; import org.junit.Test; import org.junit.rules.Timeout; @@ -22,10 +21,10 @@ import org.junit.rules.Timeout; import java.io.IOException; import java.util.List; -import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId; import static ai.vespa.metricsproxy.TestUtil.getFileContents; import static ai.vespa.metricsproxy.core.VespaMetrics.vespaMetricsConsumerId; import static ai.vespa.metricsproxy.metric.model.DimensionId.toDimensionId; +import static ai.vespa.metricsproxy.metric.model.MetricId.toMetricId; import static ai.vespa.metricsproxy.rpc.IntegrationTester.CUSTOM_CONSUMER_ID; import static ai.vespa.metricsproxy.rpc.IntegrationTester.MONITORING_SYSTEM; import static ai.vespa.metricsproxy.rpc.IntegrationTester.SERVICE_1_CONFIG_ID; @@ -68,7 +67,6 @@ public class RpcMetricsTest { public Timeout globalTimeout = Timeout.seconds(300); @Test - @Ignore("Temporarily ignore test until timeout issue is resolved") public void extra_metrics_are_added_to_output() throws Exception { try (IntegrationTester tester = new IntegrationTester()) { try (RpcClient rpcClient = new RpcClient(tester.rpcPort())) { @@ -84,7 +82,6 @@ public class RpcMetricsTest { } @Test - @Ignore("Temporarily ignore test until timeout issue is resolved") public void extra_metrics_are_purged() throws Exception { try (IntegrationTester tester = new IntegrationTester()) { try (RpcClient rpcClient = new RpcClient(tester.rpcPort())) { @@ -102,7 +99,6 @@ public class RpcMetricsTest { } @Test - @Ignore("Temporarily ignore test until timeout issue is resolved") public void testGetMetrics() throws Exception { try (IntegrationTester tester = new IntegrationTester()) { tester.httpServer().setResponse(METRICS_RESPONSE); @@ -193,7 +189,6 @@ public class RpcMetricsTest { } @Test - @Ignore("Temporarily ignore test until timeout issue is resolved") public void testGetAllMetricNames() { try (IntegrationTester tester = new IntegrationTester()) { |