summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-06-15 19:31:18 +0200
committerjonmv <venstad@gmail.com>2022-06-15 19:31:18 +0200
commit947c821385c7c2da8bad56d5e5dc88b76b709a45 (patch)
tree992575a33c313dba6593c18d180e70ae866d5c6d /controller-server
parent10918a4ff2c9b9d89574052521d03a45d4b2f842 (diff)
Update tests
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java8
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json25
2 files changed, 4 insertions, 29 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
index c5d2dad20bc..2c0ab97c00e 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiTest.java
@@ -797,13 +797,13 @@ public class ApplicationApiTest extends ControllerContainerTest {
},
200);
- // GET application package for previous build
+ // GET application package for specific build
tester.assertResponse(request("/application/v4/tenant/tenant1/application/application1/package", GET)
- .properties(Map.of("build", "1"))
+ .properties(Map.of("build", "2"))
.userIdentity(HOSTED_VESPA_OPERATOR),
(response) -> {
- assertEquals("attachment; filename=\"tenant1.application1-build1.zip\"", response.getHeaders().getFirst("Content-Disposition"));
- assertArrayEquals(applicationPackageInstance1.zippedContent(), response.getBody());
+ assertEquals("attachment; filename=\"tenant1.application1-build2.zip\"", response.getHeaders().getFirst("Content-Disposition"));
+ assertArrayEquals(packageWithService.zippedContent(), response.getBody());
},
200);
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json
index 81d363aa3e8..f39aab26d75 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/application/responses/deployment-overview.json
@@ -47,14 +47,6 @@
"sourceUrl": "repository1/tree/commit1",
"commit": "commit1"
}
- },
- {
- "application": {
- "build": 1,
- "compileVersion": "6.1.0",
- "sourceUrl": "repository1/tree/commit1",
- "commit": "commit1"
- }
}
],
"blockers": [ ]
@@ -587,14 +579,6 @@
"sourceUrl": "repository1/tree/commit1",
"commit": "commit1"
}
- },
- {
- "application": {
- "build": 1,
- "compileVersion": "6.1.0",
- "sourceUrl": "repository1/tree/commit1",
- "commit": "commit1"
- }
}
],
"blockers": [ ]
@@ -707,15 +691,6 @@
"description": "my best commit yet",
"risk": 9001,
"deployable": false
- },
- {
- "build": 1,
- "compileVersion": "6.1.0",
- "sourceUrl": "repository1/tree/commit1",
- "commit": "commit1",
- "description": "my best commit yet",
- "risk": 9001,
- "deployable": true
}
]
}