From 061f4bb0e5c3f748957e54d32ba6212d34ada45b Mon Sep 17 00:00:00 2001 From: njirap Date: Tue, 20 Dec 2016 20:45:01 +0300 Subject: [PATCH] bug 1310220: Return empty list when user has no roles (#195). r=bhearsum --- auslib/admin/views/permissions.py | 5 +---- auslib/test/admin/views/test_permissions.py | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/auslib/admin/views/permissions.py b/auslib/admin/views/permissions.py index 8a2095bbde..bc01fd18b6 100644 --- a/auslib/admin/views/permissions.py +++ b/auslib/admin/views/permissions.py @@ -102,10 +102,7 @@ class UserRolesView(AdminView): def get(self, username): roles = dbo.permissions.getUserRoles(username) - if roles: - return jsonify({"roles": roles}) - else: - return Response(status=404, response="No roles found for user") + return jsonify({"roles": roles}) class UserRoleView(AdminView): diff --git a/auslib/test/admin/views/test_permissions.py b/auslib/test/admin/views/test_permissions.py index 91500db856..625e0deff3 100644 --- a/auslib/test/admin/views/test_permissions.py +++ b/auslib/test/admin/views/test_permissions.py @@ -177,9 +177,9 @@ def testGetRoles(self): got = set(json.loads(ret.data)["roles"]) self.assertEquals(got, set(["releng", "qa"])) - def testGetRolesMissingUser(self): + def testGetRolesMissingUserReturnsEmptyList(self): ret = self.client.get("/users/dean/roles") - self.assertStatusCode(ret, 404) + self.assertStatusCode(ret, 200) def testGrantRole(self): ret = self._put("/users/ashanti/roles/dev")