Merge "Scipped tests don't render as ERROR's"

7 files changed, 55 insertions, 67 deletions

diff --git a/tests/_ldap_livetest.py b/tests/_ldap_livetest.py
index 0bd707a4..ead54ea7 100644
--- a/tests/_ldap_livetest.py
+++ b/tests/_ldap_livetest.py
@@ -16,7 +16,6 @@
 
 import ldap
 import ldap.modlist
-import nose.exc
 import subprocess
 
 from keystone.common import ldap as ldap_common
@@ -89,7 +88,7 @@ class LiveLDAPIdentity(test_backend_ldap.LDAPIdentity):
         test.TestCase.tearDown(self)
 
     def test_user_enable_attribute_mask(self):
-        raise nose.exc.SkipTest('Test is for Active Directory Only')
+        self.skipTest('Test is for Active Directory Only')
 
     def test_ldap_dereferencing(self):
         alt_users_ldif = {'objectclass': ['top', 'organizationalUnit'],
diff --git a/tests/test_backend_kvs.py b/tests/test_backend_kvs.py
index 0c6c2abe..d92a7510 100644
--- a/tests/test_backend_kvs.py
+++ b/tests/test_backend_kvs.py
@@ -15,8 +15,6 @@
 # under the License.
 import uuid
 
-import nose.exc
-
 from keystone import test
 
 from keystone import exception
@@ -36,34 +34,34 @@ class KvsIdentity(test.TestCase, test_backend.IdentityTests):
 
     def test_list_user_projects(self):
         # NOTE(chungg): not implemented
-        raise nose.exc.SkipTest('Blocked by bug 1119770')
+        self.skipTest('Blocked by bug 1119770')
 
     def test_create_duplicate_group_name_in_different_domains(self):
-        raise nose.exc.SkipTest('Blocked by bug 1119770')
+        self.skipTest('Blocked by bug 1119770')
 
     def test_create_duplicate_user_name_in_different_domains(self):
-        raise nose.exc.SkipTest('Blocked by bug 1119770')
+        self.skipTest('Blocked by bug 1119770')
 
     def test_create_duplicate_project_name_in_different_domains(self):
-        raise nose.exc.SkipTest('Blocked by bug 1119770')
+        self.skipTest('Blocked by bug 1119770')
 
     def test_move_user_between_domains(self):
-        raise nose.exc.SkipTest('Blocked by bug 1119770')
+        self.skipTest('Blocked by bug 1119770')
 
     def test_move_user_between_domains_with_clashing_names_fails(self):
-        raise nose.exc.SkipTest('Blocked by bug 1119770')
+        self.skipTest('Blocked by bug 1119770')
 
     def test_move_group_between_domains(self):
-        raise nose.exc.SkipTest('Blocked by bug 1119770')
+        self.skipTest('Blocked by bug 1119770')
 
     def test_move_group_between_domains_with_clashing_names_fails(self):
-        raise nose.exc.SkipTest('Blocked by bug 1119770')
+        self.skipTest('Blocked by bug 1119770')
 
     def test_move_project_between_domains(self):
-        raise nose.exc.SkipTest('Blocked by bug 1119770')
+        self.skipTest('Blocked by bug 1119770')
 
     def test_move_project_between_domains_with_clashing_names_fails(self):
-        raise nose.exc.SkipTest('Blocked by bug 1119770')
+        self.skipTest('Blocked by bug 1119770')
 
 
 class KvsToken(test.TestCase, test_backend.TokenTests):
diff --git a/tests/test_backend_ldap.py b/tests/test_backend_ldap.py
index 8dfe9b88..ec2b2737 100644
--- a/tests/test_backend_ldap.py
+++ b/tests/test_backend_ldap.py
@@ -17,8 +17,6 @@
 
 import uuid
 
-import nose.exc
-
 from keystone import assignment
 from keystone.common.ldap import fakeldap
 from keystone.common import sql
@@ -109,93 +107,93 @@ class BaseLDAPIdentity(test_backend.IdentityTests):
                           self.user_foo['id'])
 
     def test_get_role_grant_by_user_and_project(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101287')
+        self.skipTest('Blocked by bug 1101287')
 
     def test_get_role_grants_for_user_and_project_404(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101287')
+        self.skipTest('Blocked by bug 1101287')
 
     def test_add_role_grant_to_user_and_project_404(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101287')
+        self.skipTest('Blocked by bug 1101287')
 
     def test_remove_role_grant_from_user_and_project(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101287')
+        self.skipTest('Blocked by bug 1101287')
 
     def test_get_and_remove_role_grant_by_group_and_project(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101287')
+        self.skipTest('Blocked by bug 1101287')
 
     def test_get_and_remove_role_grant_by_group_and_domain(self):
-        raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains')
+        self.skipTest('N/A: LDAP does not support multiple domains')
 
     def test_get_and_remove_role_grant_by_user_and_domain(self):
-        raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains')
+        self.skipTest('N/A: LDAP does not support multiple domains')
 
     def test_get_and_remove_correct_role_grant_from_a_mix(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101287')
+        self.skipTest('Blocked by bug 1101287')
 
     def test_get_and_remove_role_grant_by_group_and_cross_domain(self):
-        raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains')
+        self.skipTest('N/A: LDAP does not support multiple domains')
 
     def test_get_and_remove_role_grant_by_user_and_cross_domain(self):
-        raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains')
+        self.skipTest('N/A: LDAP does not support multiple domains')
 
     def test_role_grant_by_group_and_cross_domain_project(self):
-        raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains')
+        self.skipTest('N/A: LDAP does not support multiple domains')
 
     def test_role_grant_by_user_and_cross_domain_project(self):
-        raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains')
+        self.skipTest('N/A: LDAP does not support multiple domains')
 
     def test_multi_role_grant_by_user_group_on_project_domain(self):
-        raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains')
+        self.skipTest('N/A: LDAP does not support multiple domains')
 
     def test_delete_role_with_user_and_group_grants(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101287')
+        self.skipTest('Blocked by bug 1101287')
 
     def test_delete_user_with_group_project_domain_links(self):
-        raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains')
+        self.skipTest('N/A: LDAP does not support multiple domains')
 
     def test_delete_group_with_user_project_domain_links(self):
-        raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains')
+        self.skipTest('N/A: LDAP does not support multiple domains')
 
     def test_list_user_projects(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101287')
+        self.skipTest('Blocked by bug 1101287')
 
     def test_create_duplicate_user_name_in_different_domains(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101276')
+        self.skipTest('Blocked by bug 1101276')
 
     def test_create_duplicate_project_name_in_different_domains(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101276')
+        self.skipTest('Blocked by bug 1101276')
 
     def test_create_duplicate_group_name_in_different_domains(self):
-        raise nose.exc.SkipTest(
+        self.skipTest(
             'N/A: LDAP does not support multiple domains')
 
     def test_move_user_between_domains(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101276')
+        self.skipTest('Blocked by bug 1101276')
 
     def test_move_user_between_domains_with_clashing_names_fails(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101276')
+        self.skipTest('Blocked by bug 1101276')
 
     def test_move_group_between_domains(self):
-        raise nose.exc.SkipTest(
+        self.skipTest(
             'N/A: LDAP does not support multiple domains')
 
     def test_move_group_between_domains_with_clashing_names_fails(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101276')
+        self.skipTest('Blocked by bug 1101276')
 
     def test_move_project_between_domains(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101276')
+        self.skipTest('Blocked by bug 1101276')
 
     def test_move_project_between_domains_with_clashing_names_fails(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101276')
+        self.skipTest('Blocked by bug 1101276')
 
     def test_get_roles_for_user_and_domain(self):
-        raise nose.exc.SkipTest('N/A: LDAP does not support multiple domains')
+        self.skipTest('N/A: LDAP does not support multiple domains')
 
     def test_list_role_assignments_unfiltered(self):
-        raise nose.exc.SkipTest('Blocked by bug 1195019')
+        self.skipTest('Blocked by bug 1195019')
 
     def test_multi_group_grants_on_project_domain(self):
-        raise nose.exc.SkipTest('Blocked by bug 1101287')
+        self.skipTest('Blocked by bug 1101287')
 
     def test_list_group_members_missing_entry(self):
         """List group members with deleted user.
@@ -631,7 +629,7 @@ class LDAPIdentity(test.TestCase, BaseLDAPIdentity):
         self.assertEquals(len(combined_role_list), 0)
 
     def test_list_projects_for_alternate_domain(self):
-        raise nose.exc.SkipTest(
+        self.skipTest(
             'N/A: LDAP does not support multiple domains')
 
 
@@ -705,7 +703,7 @@ class LDAPIdentityEnabledEmulation(LDAPIdentity):
                           user['id'])
 
     def test_user_enable_attribute_mask(self):
-        raise nose.exc.SkipTest(
+        self.skipTest(
             "Enabled emulation conflicts with enabled mask")
 
 
@@ -739,9 +737,9 @@ class LdapIdentitySqlAssignment(sql.Base, test.TestCase, BaseLDAPIdentity):
         self.assertEquals(domains, [assignment.DEFAULT_DOMAIN])
 
     def test_project_filter(self):
-        raise nose.exc.SkipTest(
+        self.skipTest(
             'N/A: Not part of SQL backend')
 
     def test_role_filter(self):
-        raise nose.exc.SkipTest(
+        self.skipTest(
             'N/A: Not part of SQL backend')
diff --git a/tests/test_content_types.py b/tests/test_content_types.py
index 3213656c..ebb5dcef 100644
--- a/tests/test_content_types.py
+++ b/tests/test_content_types.py
@@ -18,7 +18,6 @@ import io
 import uuid
 
 from lxml import etree
-import nose.exc
 import webtest
 
 from keystone import test
@@ -471,7 +470,7 @@ class CoreApiTests(object):
         self.assertValidTenantResponse(r)
 
     def test_get_user_roles(self):
-        raise nose.exc.SkipTest('Blocked by bug 933565')
+        self.skipTest('Blocked by bug 933565')
 
         token = self.get_scoped_token()
         r = self.admin_request(
diff --git a/tests/test_keystoneclient.py b/tests/test_keystoneclient.py
index 07bcdac4..ecab6a01 100644
--- a/tests/test_keystoneclient.py
+++ b/tests/test_keystoneclient.py
@@ -17,8 +17,6 @@
 import uuid
 import webob
 
-import nose.exc
-
 from keystone import test
 from keystone import token
 
@@ -538,7 +536,7 @@ class KeystoneClientTests(object):
                           user=uuid.uuid4().hex)
 
     def test_user_update_tenant_404(self):
-        raise nose.exc.SkipTest('N/A')
+        self.skipTest('N/A')
         from keystoneclient import exceptions as client_exceptions
         client = self.get_client(admin=True)
         self.assertRaises(client_exceptions.NotFound,
@@ -1109,10 +1107,10 @@ class KcEssex3TestCase(CompatTestCase, KeystoneClientTests):
         self.assertTrue(len(roles) > 0)
 
     def test_role_list_404(self):
-        raise nose.exc.SkipTest('N/A')
+        self.skipTest('N/A')
 
     def test_authenticate_and_delete_token(self):
-        raise nose.exc.SkipTest('N/A')
+        self.skipTest('N/A')
 
     def test_user_create_update_delete(self):
         from keystoneclient import exceptions as client_exceptions
@@ -1156,16 +1154,16 @@ class KcEssex3TestCase(CompatTestCase, KeystoneClientTests):
                           user.id)
 
     def test_user_update_404(self):
-        raise nose.exc.SkipTest('N/A')
+        self.skipTest('N/A')
 
     def test_endpoint_create_404(self):
-        raise nose.exc.SkipTest('N/A')
+        self.skipTest('N/A')
 
     def test_endpoint_delete_404(self):
-        raise nose.exc.SkipTest('N/A')
+        self.skipTest('N/A')
 
     def test_policy_crud(self):
-        raise nose.exc.SkipTest('N/A due to lack of endpoint CRUD')
+        self.skipTest('N/A due to lack of endpoint CRUD')
 
 
 class Kc11TestCase(CompatTestCase, KeystoneClientTests):
@@ -1173,4 +1171,4 @@ class Kc11TestCase(CompatTestCase, KeystoneClientTests):
         return KEYSTONECLIENT_REPO, '0.1.1'
 
     def test_policy_crud(self):
-        raise nose.exc.SkipTest('N/A')
+        self.skipTest('N/A')
diff --git a/tests/test_keystoneclient_sql.py b/tests/test_keystoneclient_sql.py
index 5706bef5..166d808c 100644
--- a/tests/test_keystoneclient_sql.py
+++ b/tests/test_keystoneclient_sql.py
@@ -16,8 +16,6 @@
 
 import uuid
 
-import nose.exc
-
 from keystone import test
 
 from keystone.common import sql
@@ -109,7 +107,7 @@ class KcMasterSqlTestCase(test_keystoneclient.KcMasterTestCase, sql.Base):
         #               the client and essentially refers to a non-existent
         #               policy manager in the v2 client. this test needs to be
         #               moved to a test suite running against the v3 api
-        raise nose.exc.SkipTest('Written prior to v3 client; needs refactor')
+        self.skipTest('Written prior to v3 client; needs refactor')
 
         from keystoneclient import exceptions as client_exceptions
         client = self.get_client(admin=True)
diff --git a/tests/test_v3_auth.py b/tests/test_v3_auth.py
index 2e354f71..11d66700 100644
--- a/tests/test_v3_auth.py
+++ b/tests/test_v3_auth.py
@@ -15,8 +15,6 @@
 import json
 import uuid
 
-import nose.exc
-
 from keystone import auth
 from keystone.common import cms
 from keystone import config
@@ -1438,7 +1436,7 @@ class TestTrustAuth(TestAuthInfo):
         self.identity_api.create_user(self.trustee_user_id, self.trustee_user)
 
     def test_create_trust_400(self):
-        raise nose.exc.SkipTest('Blocked by bug 1133435')
+        self.skipTest('Blocked by bug 1133435')
         self.post('/OS-TRUST/trusts', body={'trust': {}}, expected_status=400)
 
     def test_create_unscoped_trust(self):