summaryrefslogtreecommitdiffstats
path: root/tests/test_content_types.py
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2012-02-27 23:00:47 +0000
committerGerrit Code Review <review@openstack.org>2012-02-27 23:00:47 +0000
commit679fd363d8a44098cdf4fa2044b068e51016c02d (patch)
tree4aba336c78df9651db9282402a24ef0cbb546ad9 /tests/test_content_types.py
parent28129406ba2bbec2dc60b9e8733c4270d7e5d15b (diff)
parent33a13b7dcd82ee926a707bf1cc7f87ae2b90c98e (diff)
downloadkeystone-679fd363d8a44098cdf4fa2044b068e51016c02d.tar.gz
keystone-679fd363d8a44098cdf4fa2044b068e51016c02d.tar.xz
keystone-679fd363d8a44098cdf4fa2044b068e51016c02d.zip
Merge "Add HEAD /tokens/{token_id} (bug 933587)"
Diffstat (limited to 'tests/test_content_types.py')
-rw-r--r--tests/test_content_types.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/tests/test_content_types.py b/tests/test_content_types.py
index 7f749fb4..2cd7abca 100644
--- a/tests/test_content_types.py
+++ b/tests/test_content_types.py
@@ -344,13 +344,12 @@ class CoreApiTests(object):
sake of completely covering the core API.
"""
- raise nose.exc.SkipTest('Blocked by bug 933587')
-
token = self.get_scoped_token()
self.admin_request(method='HEAD', path='/v2.0/tokens/%(token_id)s' % {
'token_id': token,
},
- token=token)
+ token=token,
+ expected_status=204)
def test_endpoints(self):
raise nose.exc.SkipTest('Blocked by bug 933555')