commit d3e674e8f30b0c88e77f8a5b97116b82588840df
author Jenkins <jenkins@review.openstack.org> Thu Sep 06 18:24:07 2012 +0000
committer Gerrit Code Review <review@openstack.org> Thu Sep 06 18:24:07 2012 +0000
tree eff9e5c959810c96d1a3c44bb2a5cca34e9e0584
parent 6cdcfb69a8232d4187dea03a9e8dad291b83e10b
parent 501cacdf6d2fe130d836e5a931664b2139ef9d9c

Merge "Ensure token refresh. Fixes bug 1044316."

tempest/tests/identity/admin/test_roles.py

diff --git a/tempest/tests/identity/admin/test_roles.py b/tempest/tests/identity/admin/test_roles.py
index 4256da5..813f64a 100644
--- a/tempest/tests/identity/admin/test_roles.py
+++ b/tempest/tests/identity/admin/test_roles.py
@@ -237,10 +237,12 @@
         (user, tenant, role) = self._get_role_params()
         token = self.client.get_auth()
         self.client.delete_token(token)
-        self.assertRaises(exceptions.Unauthorized,
-                          self.client.list_user_roles, tenant['id'],
-                          user['id'])
-        self.client.clear_auth()
+        try:
+            self.assertRaises(exceptions.Unauthorized,
+                              self.client.list_user_roles, tenant['id'],
+                              user['id'])
+        finally:
+            self.client.clear_auth()
 
     def test_list_user_roles_for_non_existent_user(self):
         """Attempt to list roles of a non existent user should fail"""