diff options
author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-13 11:20:16 +0200 |
---|---|---|
committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2022-06-13 11:20:16 +0200 |
commit | df3a61afdbd380db3d610cebb58107b2893a1bfd (patch) | |
tree | fc50490335909665d32b5919b74378fb120902f3 /metrics-proxy | |
parent | dd16e35cd2d29c681ff742d11ccd26b29c4f32a9 (diff) |
Specify global test timeout
Diffstat (limited to 'metrics-proxy')
-rw-r--r-- | metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcHealthMetricsTest.java | 6 | ||||
-rw-r--r-- | metrics-proxy/src/test/java/ai/vespa/metricsproxy/rpc/RpcMetricsTest.java | 5 |
2 files changed, 11 insertions, 0 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 9a625c57628..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,9 @@ import com.yahoo.jrt.StringValue; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; import com.yahoo.jrt.Transport; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import java.util.List; @@ -35,6 +37,10 @@ public class RpcHealthMetricsTest { getFileContents("rpc-json-output-check.json").trim(); private static final double RPC_INVOKE_TIMEOUT = 60.0; + + @Rule + public Timeout globalTimeout = Timeout.seconds(300); + @Test public void expected_response_is_returned() { try (IntegrationTester tester = new IntegrationTester()) { 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 ba553a45260..540e6dcffbf 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,9 @@ import com.yahoo.jrt.StringValue; import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; import com.yahoo.jrt.Transport; +import org.junit.Rule; import org.junit.Test; +import org.junit.rules.Timeout; import java.io.IOException; import java.util.List; @@ -61,6 +63,9 @@ public class RpcMetricsTest { } } + @Rule + public Timeout globalTimeout = Timeout.seconds(300); + @Test public void extra_metrics_are_added_to_output() throws Exception { try (IntegrationTester tester = new IntegrationTester()) { |