diff options
Diffstat (limited to 'snaps/openstack/tests/create_user_tests.py')
-rw-r--r-- | snaps/openstack/tests/create_user_tests.py | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/snaps/openstack/tests/create_user_tests.py b/snaps/openstack/tests/create_user_tests.py index d3eb4a6..c15a71f 100644 --- a/snaps/openstack/tests/create_user_tests.py +++ b/snaps/openstack/tests/create_user_tests.py @@ -106,10 +106,11 @@ class CreateUserSuccessTests(OSComponentTestCase): self.user_settings = UserConfig( name=guid + '-name', password=guid + '-password', - roles={'admin': self.os_creds.project_name}, + roles={'admin': self.os_creds.project_name, + 'Admin': self.os_creds.project_name}, domain_name=self.os_creds.user_domain_name) - self.keystone = keystone_utils.keystone_client(self.os_creds) + self.keystone = keystone_utils.keystone_client(self.os_creds, self.os_session) # Initialize for cleanup self.user_creator = None @@ -121,6 +122,8 @@ class CreateUserSuccessTests(OSComponentTestCase): if self.user_creator: self.user_creator.clean() + super(self.__class__, self).__clean__() + def test_create_user(self): """ Tests the creation of an OpenStack user. @@ -181,6 +184,8 @@ class CreateUserSuccessTests(OSComponentTestCase): self.assertEqual(created_user, retrieved_user) role = keystone_utils.get_role_by_name(self.keystone, 'admin') + if not role: + role = keystone_utils.get_role_by_name(self.keystone, 'Admin') self.assertIsNotNone(role) os_proj = keystone_utils.get_project( |