Merge "Ignore most of the new hacking 0.9.2 rules"

This commit is contained in:
Jenkins 2014-06-14 18:37:12 +00:00 committed by Gerrit Code Review
commit 0da5bfe428
3 changed files with 5 additions and 4 deletions

View File

@ -36,7 +36,7 @@ class ListUsage(lister.Lister):
metavar="<start>", metavar="<start>",
default=None, default=None,
help="Usage range start date, ex 2012-01-20" help="Usage range start date, ex 2012-01-20"
" (default: 4 weeks ago)." " (default: 4 weeks ago)."
) )
parser.add_argument( parser.add_argument(
"--end", "--end",

View File

@ -107,8 +107,9 @@ class TestFindResource(test_utils.TestCase):
def test_find_resource_find_not_found(self): def test_find_resource_find_not_found(self):
self.manager.get = mock.Mock(side_effect=Exception('Boom!')) self.manager.get = mock.Mock(side_effect=Exception('Boom!'))
self.manager.find = mock.Mock(side_effect= self.manager.find = mock.Mock(
exceptions.NotFound(404, "2")) side_effect=exceptions.NotFound(404, "2")
)
result = self.assertRaises(exceptions.CommandError, result = self.assertRaises(exceptions.CommandError,
utils.find_resource, utils.find_resource,
self.manager, self.manager,

View File

@ -24,6 +24,6 @@ commands = python setup.py test --coverage --testr-args='{posargs}'
downloadcache = ~/cache/pip downloadcache = ~/cache/pip
[flake8] [flake8]
ignore = E126,E202,W602,H302,H402 ignore = E126,E202,W602,H302,H402,E265,H305,H307,H405,H904
show-source = True show-source = True
exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools exclude = .venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build,tools