summaryrefslogtreecommitdiffstats
path: root/node-repository/src/test
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2017-09-07 15:29:49 +0200
committerMartin Polden <mpolden@mpolden.no>2017-09-07 15:29:49 +0200
commit145c3b3151dba85b4db54e2c218545f19cebe958 (patch)
tree1d1f5a070a14f4f41fd5e9221a5d73283c04a284 /node-repository/src/test
parentcacf9446075f14297060a56a1cec41700e321825 (diff)
Ensure that async deployment locks application
Diffstat (limited to 'node-repository/src/test')
-rw-r--r--node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java
index 0a9e30f3d6b..d9a6b62bbe9 100644
--- a/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java
+++ b/node-repository/src/test/java/com/yahoo/vespa/hosted/provision/maintenance/PeriodicApplicationMaintainerTest.java
@@ -7,7 +7,6 @@ import com.yahoo.config.provision.ApplicationName;
import com.yahoo.config.provision.Capacity;
import com.yahoo.config.provision.ClusterSpec;
import com.yahoo.config.provision.Deployer;
-import com.yahoo.config.provision.Deployment;
import com.yahoo.config.provision.DockerImage;
import com.yahoo.config.provision.Environment;
import com.yahoo.config.provision.HostSpec;
@@ -217,8 +216,8 @@ public class PeriodicApplicationMaintainerTest {
}
@Override
- protected void deploy(ApplicationId application, Deployment deployment) {
- deployment.activate();
+ protected void deploy(ApplicationId application) {
+ deployWithLock(application);
}
protected void throttle(int applicationCount) { }