Merge "Clean up removed hacking rule from [flake8] ignore lists"

This commit is contained in:
Jenkins 2016-01-15 14:56:59 +00:00 committed by Gerrit Code Review
commit b7002e2e56
10 changed files with 13 additions and 13 deletions

View File

@ -63,4 +63,4 @@ class ViewBuilder(object):
def _get_base_url_without_version(self): def _get_base_url_without_version(self):
"""Get the base URL with out the /v1 suffix.""" """Get the base URL with out the /v1 suffix."""
return re.sub('v[1-9]+/?$', '', self.base_url) return re.sub('v[1-9]+/?$', '', self.base_url)

View File

@ -50,4 +50,4 @@ class NetAppBaseHelper(object):
@abc.abstractmethod @abc.abstractmethod
def get_share_name_for_share(self, share): def get_share_name_for_share(self, share):
"""Returns the flexvol name that hosts a share.""" """Returns the flexvol name that hosts a share."""

View File

@ -33,4 +33,4 @@ class VersionedMethodTestCase(test.TestCase):
method = versioned_method.VersionedMethod( method = versioned_method.VersionedMethod(
'fake_name', 'fake_start_version', 'fake_end_version', False, 'fake_name', 'fake_start_version', 'fake_end_version', False,
'fake_func') 'fake_func')
self.assertEqual('fake_start_version', method._cmpkey()) self.assertEqual('fake_start_version', method._cmpkey())

View File

@ -221,4 +221,4 @@ class ExperimentalAPITestCase(test.TestCase):
response = self.req.get_response(self.app) response = self.req.get_response(self.app)
self.assertEqual(404, response.status_int) self.assertEqual(404, response.status_int)
self.assertTrue(response.headers.get(experimental_header_name)) self.assertTrue(response.headers.get(experimental_header_name))

View File

@ -678,4 +678,4 @@ class ShareTypeAccessTest(test.TestCase):
self.assertRaises(webob.exc.HTTPNotFound, self.assertRaises(webob.exc.HTTPNotFound,
self.controller._remove_project_access, self.controller._remove_project_access,
req, '777', body) req, '777', body)

View File

@ -152,4 +152,4 @@ class ViewBuilderTestCase(test.TestCase):
result = builder._get_base_url_without_version() result = builder._get_base_url_without_version()
self.assertEqual(base_url_no_version, result) self.assertEqual(base_url_no_version, result)

View File

@ -510,4 +510,4 @@ class ShareMigrationHelperTestCase(test.TestCase):
self.helper.deny_rules_and_wait.assert_called_once_with( self.helper.deny_rules_and_wait.assert_called_once_with(
self.context, self.share, access_active) self.context, self.share, access_active)
self.helper.add_rules_and_wait.assert_called_once_with( self.helper.add_rules_and_wait.assert_called_once_with(
self.context, self.share, access_active) self.context, self.share, access_active)

View File

@ -140,4 +140,4 @@ class SchedulerStatsAdminTest(base.BaseSharesAdminTest):
self.assertEmpty(pool_list) self.assertEmpty(pool_list)
def _wrap_regex_for_exact_match(self, regex): def _wrap_regex_for_exact_match(self, regex):
return '^%s$' % regex return '^%s$' % regex

View File

@ -3,7 +3,7 @@
# process, which may cause wedges in the gate later. # process, which may cause wedges in the gate later.
# hacking should be first # hacking should be first
hacking<0.10,>=0.9.2 hacking<0.11,>=0.10.2
bashate>=0.2 # Apache-2.0 bashate>=0.2 # Apache-2.0
coverage>=3.6 coverage>=3.6

View File

@ -68,10 +68,10 @@ commands = python tools/lintstack.py check
[flake8] [flake8]
# Following checks are ignored on purpose: # Following checks are ignored on purpose:
# # H105 using author tags
# H904 wrap long lines in parentheses instead of a backslash # H238 hacking no old style class
# reason: removed in hacking (https://review.openstack.org/#/c/101701/) # H501 hacking no locals
ignore = H904 ignore = H105,H238,H501
builtins = _ builtins = _
exclude = .venv,.tox,dist,doc,*egg exclude = .venv,.tox,dist,doc,*egg