diff options
| author | jonmv <venstad@gmail.com> | 2023-03-31 13:24:26 +0200 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-03-31 13:24:26 +0200 |
| commit | 71163e6de96cfeb8a24eb167d1d17a7741b0ba1e (patch) | |
| tree | ca60b820c73a38da1dcfbb8bb61fd7560f2ca183 /controller-server/src/test | |
| parent | d65d548169183b47b931b3c5e39ad5a8fae06ce5 (diff) | |
Validate all future jobs (submit) and current (deploy) have zone in account
Diffstat (limited to 'controller-server/src/test')
| -rw-r--r-- | controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java index 8f0536480f5..d9ee82f5e90 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java @@ -1429,9 +1429,14 @@ public class ControllerTest { // Deployment fails because zone is not configured in requested cloud account tester.controllerTester().flagSource().withListFlag(PermanentFlags.CLOUD_ACCOUNTS.id(), List.of(cloudAccount), String.class); - context.submit(applicationPackage) - .runJobExpectingFailure(systemTest, "Zone test.us-east-1 is not configured in requested cloud account '012345678912'") - .abortJob(stagingTest); + assertEquals("Zone test.us-east-1 is not configured in requested cloud account '012345678912'", + assertThrows(IllegalArgumentException.class, + () -> context.submit(applicationPackage)) + .getMessage()); + assertEquals("Zone dev.us-east-1 is not configured in requested cloud account '012345678912'", + assertThrows(IllegalArgumentException.class, + () -> context.runJob(devUsEast1, applicationPackage)) + .getMessage()); // Deployment to prod succeeds once all zones are configured in requested account tester.controllerTester().zoneRegistry().configureCloudAccount(CloudAccount.from(cloudAccount), |