diff options
author | Jon Bratseth <bratseth@vespa.ai> | 2023-05-09 12:49:50 +0200 |
---|---|---|
committer | Jon Bratseth <bratseth@vespa.ai> | 2023-05-09 12:49:50 +0200 |
commit | 232f4384b13af3c3b94a6bd25fc9d11114c87ff2 (patch) | |
tree | 25fdf78282a3d8b6a276841d5fa58b6b6c587729 /config-model-api/src/test/java/com/yahoo/config/application/api | |
parent | 3cf58185936ca332f86214999c86a7b3c1213933 (diff) |
Support a default BCP deadline
Diffstat (limited to 'config-model-api/src/test/java/com/yahoo/config/application/api')
-rw-r--r-- | config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithBcpTest.java | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithBcpTest.java b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithBcpTest.java index a78f53e2084..9fe1d08b904 100644 --- a/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithBcpTest.java +++ b/config-model-api/src/test/java/com/yahoo/config/application/api/DeploymentSpecWithBcpTest.java @@ -104,7 +104,7 @@ public class DeploymentSpecWithBcpTest { var spec = DeploymentSpec.fromXml(r); - var betaBcp = spec.requireInstance("beta").bcp().orElse(spec.bcp()); + var betaBcp = spec.requireInstance("beta").bcp(); assertEquals(1, betaBcp.groups().size()); var betaGroup = betaBcp.groups().get(0); assertEquals(2, betaGroup.members().size()); @@ -112,7 +112,7 @@ public class DeploymentSpecWithBcpTest { assertEquals(new Bcp.RegionMember(RegionName.from("us-east1"), 1.0), betaGroup.members().get(0)); assertEquals(new Bcp.RegionMember(RegionName.from("us-east2"), 1.0), betaGroup.members().get(1)); - var mainBcp = spec.requireInstance("main").bcp().orElse(spec.bcp()); + var mainBcp = spec.requireInstance("main").bcp(); assertEquals(7, mainBcp.regions().size()); assertEquals(3, mainBcp.groups().size()); @@ -214,7 +214,7 @@ public class DeploymentSpecWithBcpTest { fail(); } catch (IllegalArgumentException e) { - assertEquals("Illegal deadline 'fast': Must end by 'm'", Exceptions.toMessageString(e)); + assertEquals("Illegal deadline 'fast': Must be an integer followed by 'm' or 'h'", Exceptions.toMessageString(e)); } } @@ -403,7 +403,7 @@ public class DeploymentSpecWithBcpTest { } private void assertTwoRegions(DeploymentSpec spec) { - var bcp = spec.requireInstance("default").bcp().orElse(spec.bcp()); + var bcp = spec.requireInstance("default").bcp(); assertEquals(1, bcp.groups().size()); var group = bcp.groups().get(0); assertEquals(2, group.members().size()); |