summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2019-10-02 17:48:25 +0200
committerJon Marius Venstad <venstad@gmail.com>2019-10-02 17:48:25 +0200
commitbd00e909737a086ac8e3de4e8c374f3a0c755bc6 (patch)
treeffc09598d83800b4bed6b30a4b6a4a4fe1c4634b
parent816cf75a092b426f671799c645d04845758181eb (diff)
Fix test that was changed prematurely
-rw-r--r--controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java7
1 files changed, 1 insertions, 6 deletions
diff --git a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java
index db72a618c47..f2410c47908 100644
--- a/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java
+++ b/controller-server/src/test/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiTest.java
@@ -190,15 +190,10 @@ public class UserApiTest extends ControllerContainerCloudTest {
"{\"message\":\"Deleted application my-tenant.my-app\"}");
// DELETE a tenant role is available to tenant admins.
- tester.assertResponse(request("/user/v1/tenant/my-tenant", DELETE)
- .roles(Set.of(Role.tenantAdmin(id.tenant())))
- .data("{\"user\":\"operator@tenant\",\"roleName\":\"tenantOperator\"}"),
- "{\"message\":\"user 'operator@tenant' is no longer a member of role 'tenantOperator' of 'my-tenant'\"}");
-
// DELETE the developer role clears any developer key.
tester.assertResponse(request("/user/v1/tenant/my-tenant", DELETE)
.roles(Set.of(Role.tenantAdmin(id.tenant())))
- .data("{\"user\":\"operator@tenant\",\"roleName\":\"developer\"}"),
+ .data("{\"user\":\"operator@tenant\",\"roleName\":\"tenantOperator\"}"),
"{\"message\":\"user 'operator@tenant' is no longer a member of role 'tenantOperator' of 'my-tenant'\"}");
// DELETE the last tenant owner is not allowed.