summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@oath.com>2018-02-16 15:48:47 +0100
committerBjørn Christian Seime <bjorncs@oath.com>2018-02-16 15:48:47 +0100
commit079285a0ccb45085d83a12f4e302e3714236ea91 (patch)
tree1f3b434530b0a91ebe09ea3df5da153b0c752289 /controller-server
parent168082781445b38050711c99efde763b739db827 (diff)
Replace all use of deprecated jobreport API with application api equivalent
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java5
1 files changed, 3 insertions, 2 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java
index 274d2f63fa8..679b0114721 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/ScrewdriverApiTest.java
@@ -36,6 +36,7 @@ import static org.junit.Assert.assertTrue;
* @author bratseth
* @author jvenstad
*/
+// TODO Move /application/v4/.../jobreport specific testing to ApplicationApiTest
public class ScrewdriverApiTest extends ControllerContainerTest {
private static final String responseFiles = "src/test/java/com/yahoo/vespa/hosted/controller/restapi/screwdriver/responses/";
@@ -183,10 +184,10 @@ public class ScrewdriverApiTest extends ControllerContainerTest {
}
private void notifyCompletion(ApplicationId app, long projectId, JobType jobType, Optional<JobError> error) throws IOException {
- assertResponse(new Request("http://localhost:8080/screwdriver/v1/jobreport",
+ assertResponse(new Request("http://localhost:8080/application/v4/tenant/tenant1/application/application1/jobreport",
jsonReport(app, jobType, projectId, 1L, error).getBytes(StandardCharsets.UTF_8),
Request.Method.POST),
- 200, "ok");
+ 200, "{\"message\":\"ok\"}");
}
private static String jsonReport(ApplicationId applicationId, JobType jobType, long projectId, long buildNumber,