summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorMartin Polden <mpolden@mpolden.no>2018-06-29 14:03:20 +0200
committerMartin Polden <mpolden@mpolden.no>2018-06-29 14:03:20 +0200
commit7651987f59bae319066923a8ce662617f013959c (patch)
tree90b5626d13117f90e64ab2075ed20e5c402a5b34 /controller-server
parentd537209b4362f533ba00e3995838bec5307f4b28 (diff)
Rename test
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java5
1 files changed, 2 insertions, 3 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
index 6b7dd768502..036aee5026f 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/ControllerTest.java
@@ -782,7 +782,7 @@ public class ControllerTest {
}
@Test
- public void testDeployWithoutProjectId() {
+ public void testDeployDirectly() {
DeploymentTester tester = new DeploymentTester();
tester.controllerTester().zoneRegistry().setSystemName(SystemName.cd);
tester.controllerTester().zoneRegistry().setZones(ZoneId.from("prod", "cd-us-central-1"));
@@ -794,7 +794,7 @@ public class ControllerTest {
// Create application
Application app = tester.createApplication("app1", "tenant1", 1, 2L);
- // Direct deploy is allowed when project ID is missing
+ // Direct deploy is allowed when deployDirectly is true
ZoneId zone = ZoneId.from("prod", "cd-us-central-1");
// Same options as used in our integration tests
DeployOptions options = new DeployOptions(true, Optional.empty(), false,
@@ -806,7 +806,6 @@ public class ControllerTest {
assertTrue("No job status added",
tester.applications().require(app.id()).deploymentJobs().jobStatus().isEmpty());
-
}
private void runUpgrade(DeploymentTester tester, ApplicationId application, ApplicationVersion version) {