From 281e1e9d399bbf8f3b4ffa2f46ba267b13d17385 Mon Sep 17 00:00:00 2001 From: Ruslan Kamaldinov Date: Fri, 14 Nov 2014 03:22:33 +0300 Subject: [PATCH] Enable H202 assertRaises Exception too broad Change-Id: I49ff7f0c7b2edbd1a3c1a53ef2ffc95922db6f3b --- tox.ini | 3 +-- yaql/tests/test_system.py | 27 +++++++++++++++++---------- 2 files changed, 18 insertions(+), 12 deletions(-) diff --git a/tox.ini b/tox.ini index 2183d38..d11522b 100644 --- a/tox.ini +++ b/tox.ini @@ -30,10 +30,9 @@ commands = python setup.py build_sphinx # H404 multi line docstring should start with a summary ## TODO(ruhe) following checks should be fixed # E721 do not compare types, use 'isinstance()' -# H202 assertRaises Exception too broad # H306 imports not in alphabetical order # H902 Use the 'not in' operator for collection membership evaluation show-source = True -ignore = E123,E125,E721,H202,H306,H404,H803,H902 +ignore = E123,E125,E721,H306,H404,H803,H902 builtins = _ exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build diff --git a/yaql/tests/test_system.py b/yaql/tests/test_system.py index c6cf912..8a354ab 100644 --- a/yaql/tests/test_system.py +++ b/yaql/tests/test_system.py @@ -17,6 +17,7 @@ import unittest from yaql.tests import YaqlTest import yaql from yaql.language.engine import parameter +from yaql.language.exceptions import YaqlExecutionException class TestSystem(YaqlTest): @@ -45,9 +46,10 @@ class TestSystem(YaqlTest): self.bar = value foo = Foo(42) - self.assertRaises(Exception, self.eval, '$.foo.missing', foo) - self.assertRaises(Exception, self.eval, '$.foo.missing', - {'foo': 'bar'}) + self.assertRaises(YaqlExecutionException, + self.eval, '$.foo.missing', foo) + self.assertRaises(YaqlExecutionException, + self.eval, '$.foo.missing', {'foo': 'bar'}) def test_int_bool_resolving(self): @parameter('param', arg_type=types.IntType) @@ -72,18 +74,23 @@ class TestSystem(YaqlTest): self.assertEquals("int: 1", self.eval('foo(1)', context=context1)) self.assertEquals("int: 0", self.eval('foo(0)', context=context1)) - self.assertRaises(Exception, self.eval, "foo('1')", context=context1) - self.assertRaises(Exception, self.eval, 'foo(1)', context=context2) + self.assertRaises(YaqlExecutionException, + self.eval, "foo('1')", context=context1) + self.assertRaises(YaqlExecutionException, + self.eval, 'foo(1)', context=context2) self.assertEquals("bool: True", self.eval('foo(true)', context=context2)) self.assertEquals("bool: False", self.eval('foo(false)', context=context2)) - self.assertRaises(Exception, self.eval, "foo(1)", context=context2) - self.assertRaises(Exception, self.eval, 'foo(0)', context=context2) - self.assertRaises(Exception, self.eval, 'foo(True)', context=context2) - self.assertRaises(Exception, self.eval, "foo('true')", - context=context2) + self.assertRaises(YaqlExecutionException, + self.eval, "foo(1)", context=context2) + self.assertRaises(YaqlExecutionException, + self.eval, 'foo(0)', context=context2) + self.assertRaises(YaqlExecutionException, + self.eval, 'foo(True)', context=context2) + self.assertRaises(YaqlExecutionException, + self.eval, "foo('true')", context=context2) self.assertEquals("int: 1", self.eval('foo(1)', context=context3)) self.assertEquals("int: 0", self.eval('foo(0)', context=context3))