aboutsummaryrefslogtreecommitdiffstats
path: root/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
diff options
context:
space:
mode:
authorJon Marius Venstad <jvenstad@yahoo-inc.com>2018-08-13 13:22:55 +0200
committerJon Marius Venstad <jvenstad@yahoo-inc.com>2018-08-13 13:22:55 +0200
commit98eebc5f7ea07dfab4db2f631a0f904554015182 (patch)
tree2c8abce2ccdaeea916fff1971021e9f871ad6f1d /controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java
parentabffcac3bcbc0739465a9d537f35861a87059e7d (diff)
Clean up deactivation code
Diffstat (limited to 'controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/deployment/DeploymentTester.java3
1 files changed, 1 insertions, 2 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 75a6d3d72d9..44af8edb96e 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
@@ -30,7 +30,6 @@ import java.time.Duration;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
-import java.util.stream.Collectors;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertFalse;
@@ -267,7 +266,7 @@ public class DeploymentTester {
}
// Deactivate test deployments after deploy. This replicates the behaviour of the tenant pipeline
if (job.isTest()) {
- controller().applications().deactivate(application, job.zone(controller().system()));
+ controller().applications().deactivate(application.id(), job.zone(controller().system()));
}
jobCompletion(job).application(application).success(success).submit();
}