openstack
/
metalsmith
Code Issues Proposed changes

Start enforcing W504 in pep8 

Apparently, not disabling W503 results in W504 ignored. The latter
seems to be preferred now.

Change-Id: I53124ff7b4083382dc24f32fe9affe6fc7478281
This commit is contained in:
Dmitry Tantsur 2020-05-04 11:27:57 +02:00
parent 05ed2cf76b
commit 954a6cab6d
3 changed files with 21 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
metalsmith/sources.py
View File

@ -63,9 +63,9 @@ class GlanceImage(_Source):
'Cannot find image %(image)s: %(error)s' %
{'image': self.image, 'error': exc})
if (root_size_gb is None and
any(getattr(self._image_obj, x, None) is not None
for x in ('kernel_id', 'ramdisk_id'))):
if (root_size_gb is None
and any(getattr(self._image_obj, x, None) is not None
for x in ('kernel_id', 'ramdisk_id'))):
raise exceptions.UnknownRootDiskSize(
'Partition images require root partition size')

32
metalsmith/test/test_cmd.py
View File

@ -108,8 +108,8 @@ class TestDeploy(testtools.TestCase):
self.assertIsInstance(source, sources.GlanceImage)
self.assertEqual("myimg", source.image)
self.assertEqual(
mock.call('metalsmith').setLevel(mock_log.WARNING).call_list() +
mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock.call('metalsmith').setLevel(mock_log.WARNING).call_list()
+ mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock_log.CRITICAL).call_list(),
mock_log.getLogger.mock_calls)
@ -134,8 +134,8 @@ class TestDeploy(testtools.TestCase):
self.assertIsInstance(source, sources.GlanceImage)
self.assertEqual("myimg", source.image)
self.assertEqual(
mock.call('metalsmith').setLevel(mock_log.WARNING).call_list() +
mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock.call('metalsmith').setLevel(mock_log.WARNING).call_list()
+ mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock_log.CRITICAL).call_list(),
mock_log.getLogger.mock_calls)
@ -155,8 +155,8 @@ class TestDeploy(testtools.TestCase):
mock_log.basicConfig.assert_called_once_with(level=mock_log.WARNING,
format=mock.ANY)
self.assertEqual(
mock.call('metalsmith').setLevel(mock_log.WARNING).call_list() +
mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock.call('metalsmith').setLevel(mock_log.WARNING).call_list()
+ mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock_log.CRITICAL).call_list(),
mock_log.getLogger.mock_calls)
@ -212,8 +212,8 @@ class TestDeploy(testtools.TestCase):
mock_log.basicConfig.assert_called_once_with(level=mock_log.DEBUG,
format=mock.ANY)
self.assertEqual(
mock.call('metalsmith').setLevel(mock_log.DEBUG).call_list() +
mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock.call('metalsmith').setLevel(mock_log.DEBUG).call_list()
+ mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock_log.INFO).call_list(),
mock_log.getLogger.mock_calls)
@ -226,8 +226,8 @@ class TestDeploy(testtools.TestCase):
mock_log.basicConfig.assert_called_once_with(level=mock_log.CRITICAL,
format=mock.ANY)
self.assertEqual(
mock.call('metalsmith').setLevel(mock_log.CRITICAL).call_list() +
mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock.call('metalsmith').setLevel(mock_log.CRITICAL).call_list()
+ mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock_log.CRITICAL).call_list(),
mock_log.getLogger.mock_calls)
@ -242,8 +242,8 @@ class TestDeploy(testtools.TestCase):
mock_log.basicConfig.assert_called_once_with(level=mock_log.WARNING,
format=mock.ANY)
self.assertEqual(
mock.call('metalsmith').setLevel(mock_log.INFO).call_list() +
mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock.call('metalsmith').setLevel(mock_log.INFO).call_list()
+ mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock_log.CRITICAL).call_list(),
mock_log.getLogger.mock_calls)
@ -256,8 +256,8 @@ class TestDeploy(testtools.TestCase):
mock_log.basicConfig.assert_called_once_with(level=mock_log.INFO,
format=mock.ANY)
self.assertEqual(
mock.call('metalsmith').setLevel(mock_log.DEBUG).call_list() +
mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock.call('metalsmith').setLevel(mock_log.DEBUG).call_list()
+ mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock_log.CRITICAL).call_list(),
mock_log.getLogger.mock_calls)
@ -270,8 +270,8 @@ class TestDeploy(testtools.TestCase):
mock_log.basicConfig.assert_called_once_with(level=mock_log.DEBUG,
format=mock.ANY)
self.assertEqual(
mock.call('metalsmith').setLevel(mock_log.DEBUG).call_list() +
mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock.call('metalsmith').setLevel(mock_log.DEBUG).call_list()
+ mock.call(_cmd._URLLIB3_LOGGER).setLevel(
mock_log.INFO).call_list(),
mock_log.getLogger.mock_calls)

2
tox.ini
View File

@ -72,6 +72,8 @@ deps =
-r{toxinidir}/requirements.txt
[flake8]
# [W503] Line break before binary operator.
ignore = W503
max-complexity=15
import-order-style = pep8
application-import-names = metalsmith