Resolve some TODOs

2 files changed, 1 insertions, 21 deletions

diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
index 6552ca4a2fb..15f729e7a55 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunnerTest.java
@@ -128,22 +128,11 @@ public class InternalStepRunnerTest {
     }
 
     @Test
-    // TODO jonmv: Change to only wait for restarts, and remove triggering of restarts from runner.
     public void restartsServicesAndWaitsForRestartAndReboot() {
         RunId id = app.newRun(JobType.productionUsCentral1);
         ZoneId zone = id.type().zone(system());
         HostName host = tester.configServer().hostFor(instanceId, zone);
 
-        tester.configServer().setConfigChangeActions(new ConfigChangeActions(List.of(new RestartAction("cluster",
-                                                                                                       "container",
-                                                                                                       "search",
-                                                                                                       List.of(new ServiceInfo("queries",
-                                                                                                                               "search",
-                                                                                                                               "config",
-                                                                                                                               host.value())),
-                                                                                                       List.of("Restart it!"))),
-                                                                             List.of(),
-                                                                             List.of()));
         tester.runner().run();
         assertEquals(succeeded, tester.jobs().run(id).get().stepStatuses().get(Step.deployReal));
 
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
index 644d60fbe72..1ed84659f58 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/integration/ConfigServerMock.java
@@ -98,7 +98,6 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
 
     private Version lastPrepareVersion = null;
     private Consumer<ApplicationId> prepareException = null;
-    private ConfigChangeActions configChangeActions = null;
     private Supplier<String> log = () -> "INFO - All good";
 
     @Inject
@@ -106,11 +105,6 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
         bootstrap(zoneRegistry.zones().all().ids(), SystemApplication.notController());
     }
 
-    /** Sets the ConfigChangeActions that will be returned on next deployment. */
-    public void setConfigChangeActions(ConfigChangeActions configChangeActions) {
-        this.configChangeActions = configChangeActions;
-    }
-
     /** Assigns a reserved tenant node to the given deployment, with initial versions. */
     public void provision(ZoneId zone, ApplicationId application, ClusterSpec.Id clusterId) {
         var current = new ClusterResources(2, 1, new NodeResources(2,  8, 50, 1, slow, remote));
@@ -428,10 +422,7 @@ public class ConfigServerMock extends AbstractComponent implements ConfigServer
 
             PrepareResponse prepareResponse = new PrepareResponse();
             prepareResponse.message = "foo";
-            prepareResponse.configChangeActions = configChangeActions != null
-                    ? configChangeActions
-                    : new ConfigChangeActions(List.of(), List.of(), List.of());
-            setConfigChangeActions(null);
+            prepareResponse.configChangeActions = new ConfigChangeActions(List.of(), List.of(), List.of());
             prepareResponse.tenant = new TenantId("tenant");
             prepareResponse.log = warnings.getOrDefault(id, Collections.emptyList());
             return prepareResponse;