openstack/python-heatclient
Code Issues Proposed changes

Merge "Replace try...except with assertRaises"

Browse Source
This commit is contained in:
Jenkins
2014-02-25 12:38:20 +00:00
committed by Gerrit Code Review
parent 7083897195 c3bc80cf9f
commit 8503781c67
2 changed files with 18 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
heatclient/tests/test_common_http.py
View File

@@ -451,12 +451,9 @@ class HttpClientTest(testtools.TestCase):
# Replay, create client, assert
self.m.ReplayAll()
client = http.HTTPClient('http://example.com:8004')
try:
client.json_request('GET', '')
self.fail('No exception raised')
except exc.HTTPNotFound as e:
# Assert that the raised exception can be converted to string
self.assertIsNotNone(e.message)
e = self.assertRaises(exc.HTTPNotFound, client.json_request, 'GET', '')
# Assert that the raised exception can be converted to string
self.assertIsNotNone(str(e))
self.m.VerifyAll()
def test_http_300_json_request(self):
@@ -474,12 +471,10 @@ class HttpClientTest(testtools.TestCase):
# Replay, create client, assert
self.m.ReplayAll()
client = http.HTTPClient('http://example.com:8004')
try:
client.json_request('GET', '')
self.fail('No exception raised')
except exc.HTTPMultipleChoices as e:
# Assert that the raised exception can be converted to string
self.assertIsNotNone(e.message)
e = self.assertRaises(
exc.HTTPMultipleChoices, client.json_request, 'GET', '')
# Assert that the raised exception can be converted to string
self.assertIsNotNone(str(e))
self.m.VerifyAll()
def test_fake_json_request(self):

34
heatclient/tests/test_shell.py
View File

@@ -417,10 +417,8 @@ class ShellTestUserPass(ShellBase):
self.m.ReplayAll()
try:
self.shell("stack-show bad")
except exc.HTTPException as e:
self.assertEqual("ERROR: " + message, str(e))
e = self.assertRaises(exc.HTTPException, self.shell, "stack-show bad")
self.assertEqual("ERROR: " + message, str(e))
def test_parsable_verbose(self):
message = "The Stack (bad) could not be found."
@@ -442,22 +440,16 @@ class ShellTestUserPass(ShellBase):
exc.verbose = 1
try:
self.shell("stack-show bad")
except exc.HTTPException as e:
expect = 'ERROR: The Stack (bad) could not be found.\n<TRACEBACK>'
self.assertEqual(expect, str(e))
e = self.assertRaises(exc.HTTPException, self.shell, "stack-show bad")
self.assertIn(message, str(e))
def test_parsable_malformed_error(self):
invalid_json = "ERROR: {Invalid JSON Error."
self._script_keystone_client()
fakes.script_heat_error(invalid_json)
self.m.ReplayAll()
try:
self.shell("stack-show bad")
except exc.HTTPException as e:
self.assertEqual("ERROR: " + invalid_json, str(e))
e = self.assertRaises(exc.HTTPException, self.shell, "stack-show bad")
self.assertEqual("ERROR: " + invalid_json, str(e))
def test_parsable_malformed_error_missing_message(self):
missing_message = {
@@ -474,10 +466,8 @@ class ShellTestUserPass(ShellBase):
fakes.script_heat_error(jsonutils.dumps(missing_message))
self.m.ReplayAll()
try:
self.shell("stack-show bad")
except exc.HTTPException as e:
self.assertEqual("ERROR: Internal Error", str(e))
e = self.assertRaises(exc.HTTPException, self.shell, "stack-show bad")
self.assertEqual("ERROR: Internal Error", str(e))
def test_parsable_malformed_error_missing_traceback(self):
message = "The Stack (bad) could not be found."
@@ -497,11 +487,9 @@ class ShellTestUserPass(ShellBase):
exc.verbose = 1
try:
self.shell("stack-show bad")
except exc.HTTPException as e:
self.assertEqual("ERROR: The Stack (bad) could not be found.\n",
str(e))
e = self.assertRaises(exc.HTTPException, self.shell, "stack-show bad")
self.assertEqual("ERROR: The Stack (bad) could not be found.\n",
str(e))
def test_stack_show(self):
self._script_keystone_client()