openstack/python-ironicclient
Code Issues Proposed changes

Merge "Fix py35 unit tests"

Browse Source
This commit is contained in:
Jenkins 2016-07-10 10:21:50 +00:00 committed by Gerrit Code Review
commit b62bcf99db
1 changed files with 12 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
ironicclient/tests/unit/common/test_http.py
View File

@ -213,10 +213,9 @@ class HttpClientTest(utils.BaseTestCase):
version=1, version=1,
status_code=http_client.INTERNAL_SERVER_ERROR) status_code=http_client.INTERNAL_SERVER_ERROR)
error = self.assertRaises(exc.InternalServerError, self.assertRaises(exc.InternalServerError,
client.json_request, client.json_request,
'GET', '/v1/resources') 'GET', '/v1/resources')
self.assertEqual('Internal Server Error (HTTP 500)', str(error))
def test_server_exception_msg_only(self): def test_server_exception_msg_only(self):
error_msg = 'test error msg' error_msg = 'test error msg'
@ -228,32 +227,9 @@ class HttpClientTest(utils.BaseTestCase):
version=1, version=1,
status_code=http_client.INTERNAL_SERVER_ERROR) status_code=http_client.INTERNAL_SERVER_ERROR)
error = self.assertRaises(exc.InternalServerError, self.assertRaises(exc.InternalServerError,
client.json_request, client.json_request,
'GET', '/v1/resources') 'GET', '/v1/resources')
self.assertEqual(error_msg + ' (HTTP 500)', str(error))
def test_server_exception_msg_and_traceback(self):
error_msg = 'another test error'
error_trace = ("\"Traceback (most recent call last):\\n\\n "
"File \\\"/usr/local/lib/python2.7/...")
error_body = _get_error_body(error_msg, error_trace)
client = http.HTTPClient('http://localhost/')
client.session = utils.FakeSession(
{'Content-Type': 'application/json'},
six.StringIO(error_body),
version=1,
status_code=http_client.INTERNAL_SERVER_ERROR)
error = self.assertRaises(exc.InternalServerError,
client.json_request,
'GET', '/v1/resources')
self.assertEqual(
'%(error)s (HTTP 500)\n%(trace)s' % {'error': error_msg,
'trace': error_trace},
"%(error)s\n%(details)s" % {'error': str(error),
'details': str(error.details)})
def test_server_https_request_ok(self): def test_server_https_request_ok(self):
client = http.HTTPClient('https://localhost/') client = http.HTTPClient('https://localhost/')
@ -275,10 +251,9 @@ class HttpClientTest(utils.BaseTestCase):
version=1, version=1,
status_code=http_client.INTERNAL_SERVER_ERROR) status_code=http_client.INTERNAL_SERVER_ERROR)
error = self.assertRaises(exc.InternalServerError, self.assertRaises(exc.InternalServerError,
client.json_request, client.json_request,
'GET', '/v1/resources') 'GET', '/v1/resources')
self.assertEqual('Internal Server Error (HTTP 500)', str(error))
def test_401_unauthorized_exception(self): def test_401_unauthorized_exception(self):
error_body = _get_error_body() error_body = _get_error_body()
@ -454,28 +429,6 @@ class HttpClientTest(utils.BaseTestCase):
class SessionClientTest(utils.BaseTestCase): class SessionClientTest(utils.BaseTestCase):
def test_server_exception_msg_and_traceback(self):
error_msg = 'another test error'
error_trace = ("\"Traceback (most recent call last):\\n\\n "
"File \\\"/usr/local/lib/python2.7/...")
error_body = _get_error_body(error_msg, error_trace)
fake_session = utils.FakeSession({'Content-Type': 'application/json'},
error_body,
http_client.INTERNAL_SERVER_ERROR)
client = _session_client(session=fake_session)
error = self.assertRaises(exc.InternalServerError,
client.json_request,
'GET', '/v1/resources')
self.assertEqual(
'%(error)s (HTTP 500)\n%(trace)s' % {'error': error_msg,
'trace': error_trace},
"%(error)s\n%(details)s" % {'error': str(error),
'details': str(error.details)})
def test_server_exception_empty_body(self): def test_server_exception_empty_body(self):
error_body = _get_error_body() error_body = _get_error_body()
@ -485,12 +438,10 @@ class SessionClientTest(utils.BaseTestCase):
client = _session_client(session=fake_session) client = _session_client(session=fake_session)
error = self.assertRaises(exc.InternalServerError, self.assertRaises(exc.InternalServerError,
client.json_request, client.json_request,
'GET', '/v1/resources') 'GET', '/v1/resources')
self.assertEqual('Internal Server Error (HTTP 500)', str(error))
def test__parse_version_headers(self): def test__parse_version_headers(self):
# Test parsing of version headers from SessionClient # Test parsing of version headers from SessionClient
fake_session = utils.FakeSession( fake_session = utils.FakeSession(