diff options
Diffstat (limited to 'keystone-moon/keystone/tests/unit/test_cert_setup.py')
| -rw-r--r-- | keystone-moon/keystone/tests/unit/test_cert_setup.py | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/keystone-moon/keystone/tests/unit/test_cert_setup.py b/keystone-moon/keystone/tests/unit/test_cert_setup.py index 3d300810..47a99810 100644 --- a/keystone-moon/keystone/tests/unit/test_cert_setup.py +++ b/keystone-moon/keystone/tests/unit/test_cert_setup.py @@ -17,18 +17,19 @@ import os import shutil import mock +from six.moves import http_client from testtools import matchers from keystone.common import environment from keystone.common import openssl from keystone import exception -from keystone.tests import unit as tests +from keystone.tests import unit from keystone.tests.unit import rest from keystone import token -SSLDIR = tests.dirs.tmp('ssl') -CONF = tests.CONF +SSLDIR = unit.dirs.tmp('ssl') +CONF = unit.CONF DEFAULT_DOMAIN_ID = CONF.identity.default_domain_id @@ -113,11 +114,13 @@ 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=200) + method='GET', + expected_status=http_client.OK) cacert_resp = self.request(self.public_app, '/v2.0/certificates/ca', - method='GET', expected_status=200) + method='GET', + expected_status=http_client.OK) with open(CONF.signing.certfile) as f: self.assertEqual(f.read(), signing_resp.text) @@ -133,7 +136,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=200, + expected_status=http_client.OK, headers=headers) self.assertEqual('text/html', resp.content_type) @@ -146,7 +149,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=500) + expected_status=http_client.INTERNAL_SERVER_ERROR) def test_pki_certs_rebuild(self): self.test_create_pki_certs() @@ -219,7 +222,7 @@ class CertSetupTestCase(rest.RestfulTestCase): self.assertEqual(cert_file1, cert_file2) -class TestExecCommand(tests.TestCase): +class TestExecCommand(unit.TestCase): @mock.patch.object(environment.subprocess.Popen, 'poll') def test_running_a_successful_command(self, mock_poll): |