summaryrefslogtreecommitdiffstats
path: root/tests/test_keystoneclient.py
diff options
context:
space:
mode:
authorVictor Sergeyev <vsergeyev@mirantis.com>2013-07-26 16:45:59 +0300
committerVictor Sergeyev <vsergeyev@mirantis.com>2013-07-26 17:09:50 +0300
commit7c28b2753dd8fe176d734b803e0fb8abddc7e08c (patch)
tree16676e86878c10a443bb478d56076b5334fbc68a /tests/test_keystoneclient.py
parent0a401529947c98ab761256e233b157071a57ab70 (diff)
downloadkeystone-7c28b2753dd8fe176d734b803e0fb8abddc7e08c.tar.gz
keystone-7c28b2753dd8fe176d734b803e0fb8abddc7e08c.tar.xz
keystone-7c28b2753dd8fe176d734b803e0fb8abddc7e08c.zip
Scipped tests don't render as ERROR's
Replaced `raise nose.exc.SkipTest()` statement to self.skipTest(). Removed unused nose.exc imports. Fixes bug 1172794 Change-Id: Ieb353864acadef43508d185156c7fa1667baa845
Diffstat (limited to 'tests/test_keystoneclient.py')
-rw-r--r--tests/test_keystoneclient.py18
1 files changed, 8 insertions, 10 deletions
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')