openstack/deb-heat
Code Issues Proposed changes

Enable H202 style check

Browse Source 
assertRaises exception is too broad

Change-Id: I7d4b3da2ce7b2c2bd7e26299dfc9bdda93748382
This commit is contained in:
Pavlo Shchelokovskyy 2014-12-18 17:50:12 +02:00
parent 9fadfa4a7d
commit 26117bd9ea
3 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
heat/tests/test_function.py
View File

@ -31,7 +31,7 @@ from heat.tests import utils
class TestFunction(function.Function):
def validate(self):
if len(self.args) < 2:
raise Exception(_('Need more arguments'))
raise TypeError(_('Need more arguments'))
def dependencies(self, path):
return ['foo', 'bar']
@ -107,7 +107,7 @@ class ValidateTest(common.HeatTestCase):
def test_validate_func(self):
self.assertIsNone(function.validate(self.func))
self.func = TestFunction(None, 'foo', ['bar'])
ex = self.assertRaises(Exception, function.validate, self.func)
ex = self.assertRaises(TypeError, function.validate, self.func)
self.assertEqual('Need more arguments', six.text_type(ex))
def test_validate_dict(self):
@ -116,7 +116,7 @@ class ValidateTest(common.HeatTestCase):
self.func = TestFunction(None, 'foo', ['bar'])
snippet = {'foo': 'bar', 'blarg': self.func}
ex = self.assertRaises(Exception, function.validate, snippet)
ex = self.assertRaises(TypeError, function.validate, snippet)
self.assertEqual('Need more arguments', six.text_type(ex))
def test_validate_list(self):
@ -125,7 +125,7 @@ class ValidateTest(common.HeatTestCase):
self.func = TestFunction(None, 'foo', ['bar'])
snippet = {'foo': 'bar', 'blarg': self.func}
ex = self.assertRaises(Exception, function.validate, snippet)
ex = self.assertRaises(TypeError, function.validate, snippet)
self.assertEqual('Need more arguments', six.text_type(ex))
def test_validate_all(self):
@ -134,7 +134,7 @@ class ValidateTest(common.HeatTestCase):
self.func = TestFunction(None, 'foo', ['bar'])
snippet = {'foo': 'bar', 'blarg': self.func}
ex = self.assertRaises(Exception, function.validate, snippet)
ex = self.assertRaises(TypeError, function.validate, snippet)
self.assertEqual('Need more arguments', six.text_type(ex))

4
heat/tests/test_scheduler.py
View File

@ -414,7 +414,7 @@ class DependencyTaskGroupTest(common.HeatTestCase):
dummy.do_step(2, 'B').InAnyOrder('2')
dummy.do_step(3, 'B')
exc = self.assertRaises(Exception, run_tasks_with_exceptions)
exc = self.assertRaises(type(e1), run_tasks_with_exceptions)
self.assertEqual(e1, exc)
def test_exception_grace_period_expired(self):
@ -436,7 +436,7 @@ class DependencyTaskGroupTest(common.HeatTestCase):
dummy.do_step(3, 'B')
dummy.do_step(4, 'B').WithSideEffects(sleep)
exc = self.assertRaises(Exception, run_tasks_with_exceptions)
exc = self.assertRaises(type(e1), run_tasks_with_exceptions)
self.assertEqual(e1, exc)

3
tox.ini
View File

@ -52,7 +52,6 @@ commands = python setup.py build_sphinx
commands = oslo-config-generator --config-file=config-generator.conf
[flake8]
# H202 assertRaises Exception too broad
# H305 imports not grouped correctly
# H307 like imports should be grouped togethe
# H402 one line docstring needs punctuation
@ -60,7 +59,7 @@ commands = oslo-config-generator --config-file=config-generator.conf
# H405 multi line docstring summary not separated with an empty line
# H803 no full stop at the end of the commit message
# H904 Wrap long lines in parentheses instead of a backslash
ignore = H202,H305,H307,H402,H404,H405,H803,H904
ignore = H305,H307,H402,H404,H405,H803,H904
show-source = true
exclude=.venv,.git,.tox,dist,*openstack/common*,*lib/python*,*egg,tools,build
max-complexity=20