summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-10-31 14:27:27 +0100
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-10-31 14:27:27 +0100
commit62ccbdc9aca001449abfe5d6a6073a0cdbfa4c7d (patch)
tree8f8b6f95526995b3bc7631907e6ede176b44b842 /controller-server
parent0ce07f8026bd34044d6d5fa7cc0d4a9145127cba (diff)
Make OutstandingChangeDeployer accessible from DeploymentTester
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java5
1 files changed, 5 insertions, 0 deletions
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 26af0215fd6..7cb788b14aa 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
@@ -22,6 +22,7 @@ import com.yahoo.vespa.hosted.controller.integration.ApplicationStoreMock;
import com.yahoo.vespa.hosted.controller.integration.ArtifactRepositoryMock;
import com.yahoo.vespa.hosted.controller.integration.ConfigServerMock;
import com.yahoo.vespa.hosted.controller.maintenance.JobControl;
+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 com.yahoo.vespa.hosted.controller.versions.VersionStatus;
@@ -48,6 +49,7 @@ public class DeploymentTester {
private final ControllerTester tester;
private final Upgrader upgrader;
+ private final OutstandingChangeDeployer outstandingChangeDeployer;
private final ReadyJobsTrigger readyJobTrigger;
public DeploymentTester() {
@@ -60,11 +62,14 @@ public class DeploymentTester {
JobControl jobControl = new JobControl(tester.curator());
this.upgrader = new Upgrader(tester.controller(), maintenanceInterval, jobControl, tester.curator());
+ this.outstandingChangeDeployer = new OutstandingChangeDeployer(tester.controller(), maintenanceInterval, jobControl);
this.readyJobTrigger = new ReadyJobsTrigger(tester.controller(), maintenanceInterval, jobControl);
}
public Upgrader upgrader() { return upgrader; }
+ public OutstandingChangeDeployer outstandingChangeDeployer() { return outstandingChangeDeployer; }
+
public ReadyJobsTrigger readyJobTrigger() { return readyJobTrigger; }
public Controller controller() { return tester.controller(); }