summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2022-11-25 13:21:40 +0100
committerGitHub <noreply@github.com>2022-11-25 13:21:40 +0100
commit2433bce1d4126c121f691035b0d91efbf3862f33 (patch)
tree7cea775249ad063fa6e374348cefe2028a5cd62e
parentc84c58fd538273b292bf64bd723e36d52e2ad07e (diff)
parent1c38b5889c4503cd57d5e0c08396aba654c2db58 (diff)
Merge pull request #24993 from vespa-engine/jonmv/take-lock
Add timeout to test
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java2
1 files changed, 2 insertions, 0 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
index 867e03258f9..fb85b876adf 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/routing/RoutingPoliciesTest.java
@@ -39,6 +39,7 @@ import com.yahoo.vespa.hosted.controller.deployment.DeploymentTester;
import com.yahoo.vespa.hosted.controller.integration.ZoneApiMock;
import com.yahoo.vespa.hosted.rotation.config.RotationsConfig;
import org.junit.jupiter.api.Test;
+import org.junit.jupiter.api.Timeout;
import java.time.Duration;
import java.time.Instant;
@@ -511,6 +512,7 @@ public class RoutingPoliciesTest {
}
@Test
+ @Timeout(30)
void private_dns_for_vpc_endpoint() {
// Challenge answered for endpoint
RoutingPoliciesTester tester = new RoutingPoliciesTester();