aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2019-10-28 16:12:49 +0100
committerMartin Polden <mpolden@mpolden.no>2019-10-29 08:37:44 +0100
commit4560136cfbbbbba84fa90915377af69077c91dbb (patch)
tree356ad6f3c33bd3fc5be0785507962acae1672b31 /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions
parent789e5f4457115a3e7326edfdcba0794562eb0e7f (diff)
Store commit details of latest version
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java13
1 files changed, 10 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
index c3bb5cb568f..380f1c6dd48 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/versions/VersionStatusTest.java
@@ -386,9 +386,16 @@ public class VersionStatusTest {
@Test
public void testCommitDetailsPreservation() {
- InternalDeploymentTester tester = new InternalDeploymentTester();
+ HostName controller1 = HostName.from("controller-1");
+ HostName controller2 = HostName.from("controller-2");
+ HostName controller3 = HostName.from("controller-3");
+ MockCuratorDb db = new MockCuratorDb(Stream.of(controller1, controller2, controller3)
+ .map(hostName -> hostName.value() + ":2222")
+ .collect(Collectors.joining(",")));
+ InternalDeploymentTester tester = new InternalDeploymentTester(new ControllerTester(db));
+
// Commit details are set for initial version
- var version0 = new Version("6.2");
+ var version0 = new Version("7.2");
var commitSha0 = "badc0ffee";
var commitDate0 = Instant.EPOCH;
tester.controllerTester().upgradeSystem(version0);
@@ -400,7 +407,7 @@ public class VersionStatusTest {
tester.deploymentContext().submit().deploy();
// Commit details are updated for new version
- var version1 = new Version("6.3");
+ var version1 = new Version("7.3");
var commitSha1 = "deadbeef";
var commitDate1 = Instant.ofEpochMilli(123);
tester.controllerTester().upgradeController(version1, commitSha1, commitDate1);