Merge pull request #11154 from vespa-engine/jvenstad/convert-more-deployment-tests

Update UpgraderTest

1 files changed, 30 insertions, 0 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
index 0b5e44aad70..71f0910874e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalDeploymentTester.java
@@ -27,16 +27,21 @@ import com.yahoo.vespa.hosted.controller.maintenance.JobControl;
 import com.yahoo.vespa.hosted.controller.maintenance.JobRunner;
 import com.yahoo.vespa.hosted.controller.maintenance.JobRunnerTest;
 import com.yahoo.vespa.hosted.controller.maintenance.NameServiceDispatcher;
+import com.yahoo.vespa.hosted.controller.maintenance.OutstandingChangeDeployer;
 import com.yahoo.vespa.hosted.controller.maintenance.ReadyJobsTrigger;
 import com.yahoo.vespa.hosted.controller.maintenance.Upgrader;
 
 import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDateTime;
+import java.time.ZoneOffset;
 import java.util.Collections;
 import java.util.Optional;
 import java.util.logging.Logger;
 
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertSame;
 import static org.junit.Assert.assertTrue;
 
 /**
@@ -62,6 +67,7 @@ public class InternalDeploymentTester {
     private final MockTesterCloud cloud;
     private final JobRunner runner;
     private final ReadyJobsTrigger readyJobsTrigger;
+    private final OutstandingChangeDeployer outstandingChangeDeployer;
     private final NameServiceDispatcher nameServiceDispatcher;
 
     public DeploymentTester tester() { return tester; }
@@ -94,6 +100,7 @@ public class InternalDeploymentTester {
         runner = new JobRunner(tester.controller(), Duration.ofDays(1), jobControl,
                                JobRunnerTest.inThreadExecutor(), new InternalStepRunner(tester.controller()));
         readyJobsTrigger = new ReadyJobsTrigger(tester.controller(), maintenanceInterval, jobControl);
+        outstandingChangeDeployer = new OutstandingChangeDeployer(tester.controller(), maintenanceInterval, jobControl);
         nameServiceDispatcher = new NameServiceDispatcher(tester.controller(), maintenanceInterval, jobControl,
                                                           Integer.MAX_VALUE);
         defaultContext = newDeploymentContext(instanceId);
@@ -113,10 +120,24 @@ public class InternalDeploymentTester {
         return readyJobsTrigger;
     }
 
+    public OutstandingChangeDeployer outstandingChangeDeployer() { return outstandingChangeDeployer; }
+
     public NameServiceDispatcher nameServiceDispatcher() {
         return nameServiceDispatcher;
     }
 
+    public InternalDeploymentTester atHourOfDay(int hour) {
+        var dateTime = tester.clock().instant().atZone(ZoneOffset.UTC);
+        return at(LocalDateTime.of(dateTime.getYear(), dateTime.getMonth(), dateTime.getDayOfMonth(), hour,
+                                   dateTime.getMinute(), dateTime.getSecond())
+                               .toInstant(ZoneOffset.UTC));
+    }
+
+    public InternalDeploymentTester at(Instant instant) {
+        tester.clock().setInstant(instant);
+        return this;
+    }
+
     /** Returns the default deployment context owned by this */
     public DeploymentContext deploymentContext() {
         return defaultContext;
@@ -195,6 +216,15 @@ public class InternalDeploymentTester {
         newDeploymentContext(id.defaultInstance()).deployPlatform(version);
     }
 
+    public void abortAll() {
+        triggerJobs();
+        for (Run run : jobs.active()) {
+            jobs.abort(run.id());
+            runner.advance(jobs.run(run.id()).get());
+            assertTrue(jobs.run(run.id()).get().hasEnded());
+        }
+    }
+
     public void triggerJobs() {
         tester.triggerUntilQuiescence();
     }