From baf6662ac46a6102ff6a3322ddca72f88f5e394e Mon Sep 17 00:00:00 2001 From: Gabriel Hurley Date: Fri, 16 Mar 2012 16:52:35 -0700 Subject: [PATCH] Improves the BaseAdminView TestCase. Change-Id: I7786cac7dc8968d08083236e617a178e75d2e0b3 --- horizon/test.py | 16 ++++------------ 1 file changed, 4 insertions(+), 12 deletions(-) diff --git a/horizon/test.py b/horizon/test.py index 44acef0aed2..3140837118c 100644 --- a/horizon/test.py +++ b/horizon/test.py @@ -222,18 +222,10 @@ class BaseAdminViewTests(TestCase): A ``TestCase`` subclass which sets an active user with the "admin" role for testing admin-only views and functionality. """ - def setActiveUser(self, id=None, token=None, username=None, tenant_id=None, - service_catalog=None, tenant_name=None, roles=None, - authorized_tenants=None): - users.get_user_from_request = lambda x: \ - users.User(id=self.user.id, - token=self.token.id, - user=self.user.name, - tenant_id=self.tenant.id, - service_catalog=self.service_catalog, - roles=[self.roles.admin._info], - authorized_tenants=None, - request=self.request) + def setActiveUser(self, *args, **kwargs): + if "roles" not in kwargs: + kwargs['roles'] = [self.roles.admin._info] + super(BaseAdminViewTests, self).setActiveUser(*args, **kwargs) class APITestCase(TestCase):