diff options
Diffstat (limited to 'controller-server/src/test/java')
4 files changed, 4 insertions, 6 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java index 8b8e21f4d33..ab4fbf4279a 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java @@ -72,13 +72,14 @@ public class InternalStepRunnerTest { tester.setEndpoints(appId, JobType.productionUsEast3.zone(tester.tester().controller().system())); tester.deployNewSubmission(); + tester.deployNewSubmission(); tester.deployNewPlatform(new Version("7.1")); tester.jobs().unregister(appId); try { tester.tester().deployCompletely(tester.app(), InternalDeploymentTester.applicationPackage, BuildJob.defaultBuildNumber + 1); - throw new IllegalStateException("Component job should get ahead again with build numbers to produce a change."); + throw new IllegalStateException("Component job should get even again with build numbers to produce a change."); } catch (AssertionError expected) { } tester.tester().deployCompletely(tester.app(), InternalDeploymentTester.applicationPackage, BuildJob.defaultBuildNumber + 2); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java index cc1bb6c9e39..81fa1685702 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/ApplicationSerializerTest.java @@ -123,7 +123,6 @@ public class ApplicationSerializerTest { assertEquals(2, serialized.deployments().size()); assertEquals(original.deployments().get(zone1).applicationVersion(), serialized.deployments().get(zone1).applicationVersion()); assertEquals(original.deployments().get(zone2).applicationVersion(), serialized.deployments().get(zone2).applicationVersion()); - assertEquals(original.deployments().get(zone2).applicationVersion().authorEmail(), serialized.deployments().get(zone2).applicationVersion().authorEmail()); assertEquals(original.deployments().get(zone1).version(), serialized.deployments().get(zone1).version()); assertEquals(original.deployments().get(zone2).version(), serialized.deployments().get(zone2).version()); assertEquals(original.deployments().get(zone1).at(), serialized.deployments().get(zone1).at()); diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java index d15a9495805..d6334a9ea86 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/persistence/RunSerializerTest.java @@ -77,16 +77,15 @@ public class RunSerializerTest { assertEquals(ApplicationVersion.from(new SourceRevision("git@github.com:user/repo.git", "master", "f00bad"), - 123), + 123, + "a@b"), run.versions().targetApplication()); - assertEquals("a@b", run.versions().targetApplication().authorEmail().get()); assertEquals(new Version(1, 2, 2), run.versions().sourcePlatform().get()); assertEquals(ApplicationVersion.from(new SourceRevision("git@github.com:user/repo.git", "master", "badb17"), 122), run.versions().sourceApplication().get()); - assertEquals(Optional.empty(), run.versions().sourceApplication().get().authorEmail()); assertEquals(ImmutableMap.<Step, Step.Status>builder() .put(deployInitialReal, unfinished) .put(installInitialReal, failed) diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java index 5bda0d553bb..df1f202a75c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/JobControllerApiHandlerHelperTest.java @@ -76,7 +76,6 @@ public class JobControllerApiHandlerHelperTest { assertEquals(revision2, tester.app().deployments().get(productionUsCentral1.zone(tester.tester().controller().system())).applicationVersion()); assertEquals(revision1, tester.app().deployments().get(productionUsEast3.zone(tester.tester().controller().system())).applicationVersion()); assertEquals(revision2, tester.app().deployments().get(productionUsWest1.zone(tester.tester().controller().system())).applicationVersion()); - assertEquals("a@b", tester.app().deployments().get(productionUsWest1.zone(tester.tester().controller().system())).applicationVersion().authorEmail().get()); tester.clock().advance(Duration.ofMillis(1000)); |