Fix unstable test

3 files changed, 7 insertions, 9 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java
index fd742ab983a..cd1d724de9d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/Upgrader.java
@@ -19,6 +19,7 @@ import java.util.logging.Logger;
  * Maintenance job which schedules applications for Vespa version upgrade
  * 
  * @author bratseth
+ * @author mpolden
  */
 public class Upgrader extends Maintainer {
 
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 36b09708399..4c23c092cc9 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
@@ -236,15 +236,11 @@ public class ControllerTest {
         assertEquals(systemVersion, tester.configServer().lastPrepareVersion().get());
 
         // A deployment to the new region gets the same version
-        applicationPackage = new ApplicationPackageBuilder()
-                .environment(Environment.prod)
-                .region("us-west-1")
-                .region("us-east-3")
-                .build();
         tester.deployAndNotify(app1, applicationPackage, true, productionUsEast3);
         app1 = applications.require(app1.id());
         assertEquals("Application change preserves version", systemVersion, app1.deployedVersion().get());
         assertEquals(systemVersion, tester.configServer().lastPrepareVersion().get());
+        assertFalse("Change deployed", app1.deploying().isPresent());
 
         // Version upgrade changes system version
         Change.VersionChange change = new Change.VersionChange(newSystemVersion);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
index fb8b9df40ba..71eb85cd0a4 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
@@ -37,6 +37,9 @@ import static org.junit.Assert.assertTrue;
  */
 public class DeploymentTester {
 
+    // Set a long interval so that maintainers never do scheduled runs during tests
+    private static final Duration maintenanceInterval = Duration.ofDays(1);
+
     private final ControllerTester tester;
     private final Upgrader upgrader;
     private final FailureRedeployer failureRedeployer;
@@ -47,10 +50,8 @@ public class DeploymentTester {
 
     public DeploymentTester(ControllerTester tester) {
         this.tester = tester;
-        this.upgrader = new Upgrader(tester.controller(), Duration.ofMinutes(2),
-                                     new JobControl(tester.curator()));
-        this.failureRedeployer = new FailureRedeployer(tester.controller(),
-                                                       Duration.ofMinutes(2),
+        this.upgrader = new Upgrader(tester.controller(), maintenanceInterval, new JobControl(tester.curator()));
+        this.failureRedeployer = new FailureRedeployer(tester.controller(), maintenanceInterval,
                                                        new JobControl(tester.curator()));
     }