diff options
| author |   asteroide <thomas.duval@orange.com> | 2015-12-02 09:49:33 +0100 |
|---|---|---|
| committer | asteroide <thomas.duval@orange.com> | 2015-12-02 10:25:15 +0100 |
| commit | 7a5a0e4df646d46476ec7a9fcdedd638e8781f6e (patch) | |
| tree | 54eecd1210e4fb5db2b14edeac1df601da7698e2 /keystone-moon/keystone/tests/unit/test_cert_setup.py | |
| parent | 8d7b0ffa8e7a7bb09686d8f25176c364d5b6aa0e (diff) | |
Update keystone to the branch stable/liberty.
Change-Id: I7cce62ae4b4cbca525a7b9499285455bdd04993e
Diffstat (limited to 'keystone-moon/keystone/tests/unit/test_cert_setup.py')
| -rw-r--r-- | keystone-moon/keystone/tests/unit/test_cert_setup.py | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/keystone-moon/keystone/tests/unit/test_cert_setup.py b/keystone-moon/keystone/tests/unit/test_cert_setup.py index 47a99810..769e7c8e 100644 --- a/keystone-moon/keystone/tests/unit/test_cert_setup.py +++ b/keystone-moon/keystone/tests/unit/test_cert_setup.py @@ -17,7 +17,6 @@ import os import shutil import mock -from six.moves import http_client from testtools import matchers from keystone.common import environment @@ -114,13 +113,11 @@ class CertSetupTestCase(rest.RestfulTestCase): # requests don't have some of the normal information signing_resp = self.request(self.public_app, '/v2.0/certificates/signing', - method='GET', - expected_status=http_client.OK) + method='GET', expected_status=200) cacert_resp = self.request(self.public_app, '/v2.0/certificates/ca', - method='GET', - expected_status=http_client.OK) + method='GET', expected_status=200) with open(CONF.signing.certfile) as f: self.assertEqual(f.read(), signing_resp.text) @@ -136,7 +133,7 @@ class CertSetupTestCase(rest.RestfulTestCase): for accept in [None, 'text/html', 'application/json', 'text/xml']: headers = {'Accept': accept} if accept else {} resp = self.request(self.public_app, path, method='GET', - expected_status=http_client.OK, + expected_status=200, headers=headers) self.assertEqual('text/html', resp.content_type) @@ -149,7 +146,7 @@ class CertSetupTestCase(rest.RestfulTestCase): def test_failure(self): for path in ['/v2.0/certificates/signing', '/v2.0/certificates/ca']: self.request(self.public_app, path, method='GET', - expected_status=http_client.INTERNAL_SERVER_ERROR) + expected_status=500) def test_pki_certs_rebuild(self): self.test_create_pki_certs() |