diff options
author | Martin Polden <mpolden@mpolden.no> | 2021-06-24 13:45:26 +0200 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2021-06-24 13:54:33 +0200 |
commit | a43907a7e1680ad70d0e5e5c00db1df468570d90 (patch) | |
tree | 7f0a81a854e78a7d1da113c2cacde280f4708cd2 /controller-server/src/test/java/com/yahoo | |
parent | d25995ae103887c9509cb8622429a50b9138a7f7 (diff) |
Check for unchanged version in one place
Diffstat (limited to 'controller-server/src/test/java/com/yahoo')
2 files changed, 7 insertions, 5 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java index 18f03303eb0..d87dfcfa315 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgradeSchedulerTest.java @@ -118,18 +118,20 @@ public class OsUpgradeSchedulerTest { // Enough time passes since promotion of stable release tester.clock().advance(Duration.ofDays(14).plus(Duration.ofSeconds(1))); scheduler.maintain(); - OsVersionTarget target = tester.controller().osVersionTarget(cloud).get(); - assertEquals(version1, target.osVersion().version()); + OsVersionTarget target0 = tester.controller().osVersionTarget(cloud).get(); + assertEquals(version1, target0.osVersion().version()); assertEquals("No budget when upgrading to stable release", - Duration.ZERO, target.upgradeBudget()); + Duration.ZERO, target0.upgradeBudget()); // Another version is promoted, but target remains unchanged as the release hasn't aged enough tester.clock().advance(Duration.ofDays(1)); Version version2 = Version.fromString("8.2"); tester.serviceRegistry().artifactRepository().promoteOsVersion(new StableOsVersion(version2, tester.clock().instant())); scheduler.maintain(); + OsVersionTarget target1 = tester.controller().osVersionTarget(cloud).get(); assertEquals("Target is unchanged as not enough time has passed", version1, - tester.controller().osVersionTarget(cloud).get().osVersion().version()); + target1.osVersion().version()); + assertEquals("Target is not re-scheduled", target0.scheduledAt(), target1.scheduledAt()); } private static ZoneApi zone(String id, CloudName cloud) { diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java index 664a1fdc83c..f096c2f1e6c 100644 --- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java +++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/maintenance/OsUpgraderTest.java @@ -200,7 +200,7 @@ public class OsUpgraderTest { // New OS version released Version version = Version.fromString("7.1"); tester.controller().upgradeOsIn(cloud, Version.fromString("7.0"), Duration.ZERO, false); - tester.controller().upgradeOsIn(cloud, version, Duration.ZERO, false); + tester.controller().upgradeOsIn(cloud, version, Duration.ZERO, false); // Replaces existing target statusUpdater.maintain(); // zone 1 upgrades |