commit e04628e8bc75b3071bdd08bd0cd2f80e3f85fa5c
author Chris Yeoh <cyeoh@au1.ibm.com> Mon Feb 25 17:12:21 2013 +1030
committer Chris Yeoh <cyeoh@au1.ibm.com> Wed Feb 27 16:20:53 2013 +1030
tree 3e427e78fa9e196b657144f81b5948c3096e963b
parent 9a16f19fbddb8d6fe7e00155b6ed0d5829f09c0e

Standardises expected exception layout

Standardises how we handle expected exceptions to use
assertRaise rather than using try/except/else

Fixes bug 1132577

Change-Id: Idfefe4c9337e9b832d34a490da21ac32ec65edd1

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 53c5b0d..f71bed0 100644
--- a/tempest/tests/identity/admin/test_roles.py
+++ b/tempest/tests/identity/admin/test_roles.py
@@ -95,15 +95,9 @@
         role1_id = body.get('id')
         self.assertTrue('status' in resp)
         self.assertTrue(resp['status'].startswith('2'))
-
-        try:
-            resp, body = self.client.create_role(role_name)
-            # this should raise an exception
-            self.fail('Should not be able to create a duplicate role name.'
-                      ' %s' % role_name)
-        except exceptions.Duplicate:
-            pass
-        self.client.delete_role(role1_id)
+        self.addCleanup(self.client.delete_role, role1_id)
+        self.assertRaises(exceptions.Duplicate, self.client.create_role,
+                          role_name)
 
     def test_assign_user_role(self):
         # Assign a role to a user on a tenant