Enable gating on H405 and fix exiting violations

Change-Id: I7401501fea8d44afda613e2d177f304f24e4095a
This commit is contained in:
Dougal Matthews 2014-10-09 16:22:26 +01:00
parent 1edd56e3de
commit b5f97b513b
2 changed files with 13 additions and 9 deletions

10
tox.ini
View File

@ -26,10 +26,14 @@ commands = coverage erase
[tox:jenkins]
downloadcache = ~/cache/pip
# H302 - ignored because it interferes more than it helps, and uses
# suspect methods in its implementation anyway.
# H405 multi line docstring summary not separated with an empty line
[flake8]
ignore = H302,H405
ignore = H405
show-source = True
exclude=.venv,.git,.tox,dist,doc,*openstack/common*,*lib/python*,*egg,build
[hacking]
import_exceptions =
gettext.gettext,
six.StringIO,
tuskarclient.openstack.common.gettextutils._

View File

@ -15,7 +15,7 @@ import six
from tuskarclient.openstack.common.apiclient import exceptions
import tuskarclient.tests.utils as tutils
from tuskarclient.v1.overcloud_roles import OvercloudRole
from tuskarclient.v1 import overcloud_roles
from tuskarclient.v1 import overclouds_shell
@ -196,7 +196,7 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest):
def test_create_roles(self, mock_print_detail):
self.args.roles = ['foo=10']
self.tuskar.overcloud_roles.list.return_value = [
OvercloudRole(None, {'name': 'foo', 'id': 1})
overcloud_roles.OvercloudRole(None, {'name': 'foo', 'id': 1})
]
self.create(self.tuskar, self.args, outfile=self.outfile)
@ -214,7 +214,7 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest):
def test_create_roles_duplicate(self, mock_print_detail):
self.args.roles = ['foo=10', 'foo=20']
self.tuskar.overcloud_roles.list.return_value = [
OvercloudRole(None, {'name': 'foo', 'id': 1})
overcloud_roles.OvercloudRole(None, {'name': 'foo', 'id': 1})
]
self.assertRaises(
@ -228,7 +228,7 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest):
def test_create_roles_invalid_structure(self, mock_print_detail):
self.args.roles = ['foo=10', '120']
self.tuskar.overcloud_roles.list.return_value = [
OvercloudRole(None, {'name': 'foo', 'id': 1})
overcloud_roles.OvercloudRole(None, {'name': 'foo', 'id': 1})
]
self.assertRaises(
@ -242,7 +242,7 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest):
def test_create_roles_multiple_equals(self, mock_print_detail):
self.args.roles = ['foo=foo=0']
self.tuskar.overcloud_roles.list.return_value = [
OvercloudRole(None, {'name': 'foo', 'id': 1})
overcloud_roles.OvercloudRole(None, {'name': 'foo', 'id': 1})
]
self.assertRaises(
@ -256,7 +256,7 @@ class OvercloudRoleShellTest(BaseOvercloudShellTest):
def test_create_roles_with_id(self, mock_print_detail):
self.args.roles = ['12345=10']
self.tuskar.overcloud_roles.list.return_value = [
OvercloudRole(None, {'name': 'foo', 'id': 1})
overcloud_roles.OvercloudRole(None, {'name': 'foo', 'id': 1})
]
self.create(self.tuskar, self.args, outfile=self.outfile)