openstack
/
horizon
Code Issues Proposed changes

Fix pep8 errors 

Recent pep8 upgrade and corresponding pycodestyle update break
horizon pep8 job due to the new rules.

This commit fixes the following new errors:
- E226 missing whitespace around arithmetic operator
- E241 multiple spaces after ','
- E731 do not assign a lambda expression, use a def

The following errors are added to the ignore list
as there are many errors:
- E402 module level import not at top of file
- W503 line break before binary operator

Change-Id: I3478b0684175d2604bbcc1d89cbfca298b97f1e1
This commit is contained in:
Akihiro Motoki 2018-04-11 00:28:25 +09:00
parent b4eb6b992e
commit f545272f12
10 changed files with 40 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openstack_dashboard/dashboards/admin/aggregates/tests.py
View File

@ -325,7 +325,7 @@ class ManageHostsTests(test.BaseAdminViewTests):
reverse(constants.AGGREGATES_INDEX_URL))
self.assertEqual(self.mock_aggregate_get.call_count, 2)
self.mock_aggregate_get.assert_has_calls(
[mock.call(test.IsHttpRequest(), str(aggregate.id))]*2)
[mock.call(test.IsHttpRequest(), str(aggregate.id))] * 2)
self.mock_service_list.assert_called_once_with(
test.IsHttpRequest(), binary='nova-compute')
self.mock_add_host_to_aggregate.assert_called_once_with(

10
openstack_dashboard/dashboards/admin/instances/tests.py
View File

@ -50,7 +50,7 @@ class InstanceViewTest(test.BaseAdminViewTests):
self.mock_extension_supported.assert_has_calls([
mock.call('AdminActions', test.IsHttpRequest()),
mock.call('AdminActions', test.IsHttpRequest()),
mock.call('Shelve', test.IsHttpRequest())]*4)
mock.call('Shelve', test.IsHttpRequest())] * 4)
self.assertEqual(12, self.mock_extension_supported.call_count)
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())
self.mock_image_list_detailed.assert_called_once_with(
@ -94,7 +94,7 @@ class InstanceViewTest(test.BaseAdminViewTests):
self.mock_extension_supported.assert_has_calls([
mock.call('AdminActions', test.IsHttpRequest()),
mock.call('AdminActions', test.IsHttpRequest()),
mock.call('Shelve', test.IsHttpRequest())]*4)
mock.call('Shelve', test.IsHttpRequest())] * 4)
self.assertEqual(12, self.mock_extension_supported.call_count)
self.mock_flavor_list.assert_called_once_with(test.IsHttpRequest())
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())
@ -143,7 +143,7 @@ class InstanceViewTest(test.BaseAdminViewTests):
self.mock_extension_supported.assert_has_calls([
mock.call('AdminActions', test.IsHttpRequest()),
mock.call('AdminActions', test.IsHttpRequest()),
mock.call('Shelve', test.IsHttpRequest())]*4)
mock.call('Shelve', test.IsHttpRequest())] * 4)
self.assertEqual(12, self.mock_extension_supported.call_count)
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())
self.mock_flavor_get.assert_has_calls(
@ -247,7 +247,7 @@ class InstanceViewTest(test.BaseAdminViewTests):
self.mock_extension_supported.assert_has_calls([
mock.call('AdminActions', test.IsHttpRequest()),
mock.call('AdminActions', test.IsHttpRequest()),
mock.call('Shelve', test.IsHttpRequest())]*4)
mock.call('Shelve', test.IsHttpRequest())] * 4)
self.assertEqual(12, self.mock_extension_supported.call_count)
@test.create_mocks({
@ -280,7 +280,7 @@ class InstanceViewTest(test.BaseAdminViewTests):
self.mock_extension_supported.assert_has_calls([
mock.call('AdminActions', test.IsHttpRequest()),
mock.call('AdminActions', test.IsHttpRequest()),
mock.call('Shelve', test.IsHttpRequest())]*4)
mock.call('Shelve', test.IsHttpRequest())] * 4)
self.assertEqual(12, self.mock_extension_supported.call_count)
search_opts = {'marker': None, 'paginate': True, 'all_tenants': True}
self.mock_server_list.assert_called_once_with(

2
openstack_dashboard/dashboards/admin/routers/tests.py
View File

@ -287,7 +287,7 @@ class RouterTests(RouterMixin, r_test.RouterTestCase, test.BaseAdminViewTests):
self.assert_mock_multiple_calls_with_same_arguments(
self.mock_is_extension_supported, 2,
mock.call(test.IsHttpRequest(), "router_availability_zone"))
mock.call(test.IsHttpRequest(), "router_availability_zone"))
self.mock_tenant_list.assert_called_once_with(test.IsHttpRequest())

2
openstack_dashboard/dashboards/project/images/tests.py
View File

@ -307,7 +307,7 @@ class ImagesAndSnapshotsUtilsTests(BaseImagesTestCase):
self.exceptions.glance,
[shared_images, False, False],
[private_images, False, False]
]
]
images_cache = {}
ret = utils.get_available_images(self.request, self.tenant.id,
images_cache)

3
openstack_dashboard/dashboards/project/instances/utils.py
View File

@ -53,7 +53,8 @@ def sort_flavor_list(request, flavors):
sort_key = flavor_sort.get('key', 'ram')
rev = flavor_sort.get('reverse', False)
if not callable(sort_key):
key = lambda flavor: get_key(flavor, sort_key)
def key(flavor):
return get_key(flavor, sort_key)
else:
key = sort_key
flavor_list = [(flavor.id, '%s' % flavor.name)

6
openstack_dashboard/dashboards/project/networks/tests.py
View File

@ -994,7 +994,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
self._check_net_list()
self.mock_is_extension_supported.assert_called_once_with(
test.IsHttpRequest(), 'network_availability_zone')
test.IsHttpRequest(), 'network_availability_zone')
self.mock_network_delete.assert_called_once_with(
test.IsHttpRequest(), network.id)
@ -1016,7 +1016,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
self._check_net_list()
self.mock_is_extension_supported.assert_called_once_with(
test.IsHttpRequest(), 'network_availability_zone')
test.IsHttpRequest(), 'network_availability_zone')
self.mock_network_delete.assert_called_once_with(
test.IsHttpRequest(), network.id)
@ -1038,7 +1038,7 @@ class NetworkTests(test.TestCase, NetworkStubMixin):
self._check_net_list()
self.mock_is_extension_supported.assert_called_once_with(
test.IsHttpRequest(), 'network_availability_zone')
test.IsHttpRequest(), 'network_availability_zone')
self.mock_network_delete.assert_called_once_with(
test.IsHttpRequest(), network.id)

2
openstack_dashboard/dashboards/project/routers/tests.py
View File

@ -533,7 +533,7 @@ class RouterActionTests(test.TestCase):
self.mock_network_list.assert_called_once_with(
test.IsHttpRequest(), **{'router:external': True})
self.mock_is_extension_supported.assert_called_once_with(
test.IsHttpRequest(), "router_availability_zone")
test.IsHttpRequest(), "router_availability_zone")
self.mock_router_create.assert_called_once_with(
test.IsHttpRequest(), name=router.name, admin_state_up=False)

3
openstack_dashboard/test/integration_tests/basewebobject.py
View File

@ -153,5 +153,6 @@ class BaseWebObject(unittest.TestCase):
pass
def wait_till_spinner_disappears(self):
getter = lambda: self.driver.find_element(*self._spinner_locator)
def getter():
return self.driver.find_element(*self._spinner_locator)
self.wait_till_element_disappears(getter)

42
openstack_dashboard/test/test_data/neutron_data.py
View File

@ -781,31 +781,31 @@ def data(TEST):
# ids/uuids are captured from a live setup.
# This collection holds the test setup.
tdata = {'tenant_id': '19c9123a944644cb9e923497a018d0b7',
'trunk_id': '920625a3-13de-46b4-b6c9-8b35f29b3cfe',
'security_group': '3fd8c007-9093-4aa3-b475-a0c178d4e1e4',
'tag_1': 100,
'tag_2': 200,
'net': {'tst_id': '5a340332-cc92-42aa-8980-15f47c0d0f3d',
'tstalt_id': '0fb41ffd-3933-4da4-8a83-025d328aedf3'},
'subnet': {'tst_id': '0b883baf-5a21-4605-ab56-229a24ec585b',
tdata = {'tenant_id': '19c9123a944644cb9e923497a018d0b7',
'trunk_id': '920625a3-13de-46b4-b6c9-8b35f29b3cfe',
'security_group': '3fd8c007-9093-4aa3-b475-a0c178d4e1e4',
'tag_1': 100,
'tag_2': 200,
'net': {'tst_id': '5a340332-cc92-42aa-8980-15f47c0d0f3d',
'tstalt_id': '0fb41ffd-3933-4da4-8a83-025d328aedf3'},
'subnet': {'tst_id': '0b883baf-5a21-4605-ab56-229a24ec585b',
'tstalt_id': '0e184cf2-97dc-4738-b4b3-1871faf5d685'},
'child1': {'id': '9c151ffb-d7a6-4f15-8eae-d0950999fdfe',
'ip': '10.10.16.140',
'mac': 'fa:16:3e:22:63:6f',
'child1': {'id': '9c151ffb-d7a6-4f15-8eae-d0950999fdfe',
'ip': '10.10.16.140',
'mac': 'fa:16:3e:22:63:6f',
'device_id': '279989f7-54bb-41d9-ba42-0d61f12fda61'},
'child2': {'id': 'cedb145f-c163-4630-98a3-e1990744bdef',
'ip': '10.10.17.137',
'mac': 'fa:16:3e:0d:ca:eb',
'child2': {'id': 'cedb145f-c163-4630-98a3-e1990744bdef',
'ip': '10.10.17.137',
'mac': 'fa:16:3e:0d:ca:eb',
'device_id': '9872faaa-b2b2-eeee-9911-21332eedaa77'},
'parent': {'id': '5b27429d-048b-40fa-88f9-8e2c4ff7d28b',
'ip': '10.10.16.141',
'mac': 'fa:16:3e:ab:a8:22',
'parent': {'id': '5b27429d-048b-40fa-88f9-8e2c4ff7d28b',
'ip': '10.10.16.141',
'mac': 'fa:16:3e:ab:a8:22',
'device_id': 'af75c8e5-a1cc-4567-8d04-44fcd6922890'},
'plain': {'id': 'bc04da56-d7fc-461e-b95d-a2c66e77ad9a',
'ip': '10.10.16.135',
'mac': 'fa:16:3e:9c:d5:7f',
'device_id': '7180cede-bcd8-4334-b19f-f7ef2f331f53'}}
'plain': {'id': 'bc04da56-d7fc-461e-b95d-a2c66e77ad9a',
'ip': '10.10.16.135',
'mac': 'fa:16:3e:9c:d5:7f',
'device_id': '7180cede-bcd8-4334-b19f-f7ef2f331f53'}}
# network tst

4
tox.ini
View File

@ -155,7 +155,9 @@ commands =
[flake8]
filename = *.py,django.wsgi
exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py,*/local/*,*/test/test_plugins/*,.ropeproject,node_modules,openstack_dashboard/enabled/*
ignore =
# E402 module level import not at top of file
# W503 line break before binary operator
ignore = E402,W503
# Enable the following hacking rules which are disabled by default
# H106 Do not put vim configuration in source files.
# H203 Use assertIs(Not)None to check for None.