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

Conflicts:
        openstack_dashboard/dashboards/admin/aggregates/tests.py
        openstack_dashboard/dashboards/admin/instances/tests.py
        openstack_dashboard/dashboards/admin/routers/tests.py
        openstack_dashboard/dashboards/project/images/tests.py
        openstack_dashboard/dashboards/project/networks/tests.py
        openstack_dashboard/dashboards/project/routers/tests.py
        openstack_dashboard/test/test_data/neutron_data.py
        tox.ini

The conflicts are due to mox-removal efforts.

Change-Id: I3478b0684175d2604bbcc1d89cbfca298b97f1e1
(cherry picked from commit f545272f12)
This commit is contained in:
Akihiro Motoki 2018-04-11 00:28:25 +09:00
parent 5c15fb85d9
commit 8458e2580a
11 changed files with 42 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openstack_dashboard/dashboards/admin/floating_ips/tests.py
View File

@ -36,7 +36,8 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
tenants = self.tenants.list()
api.neutron.tenant_floating_ip_list(IsA(http.HttpRequest),
all_tenants=True).AndReturn(fips)
api.nova.server_list(IsA(http.HttpRequest), search_opts={'all_tenants': True}) \
api.nova.server_list(IsA(http.HttpRequest),
search_opts={'all_tenants': True}) \
.AndReturn([servers, False])
api.keystone.tenant_list(IsA(http.HttpRequest))\
.AndReturn([tenants, False])
@ -196,7 +197,8 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
tenants = self.tenants.list()
api.neutron.tenant_floating_ip_list(IsA(http.HttpRequest),
all_tenants=True).AndReturn(fips)
api.nova.server_list(IsA(http.HttpRequest), search_opts={'all_tenants': True}) \
api.nova.server_list(IsA(http.HttpRequest),
search_opts={'all_tenants': True}) \
.AndReturn([servers, False])
api.keystone.tenant_list(IsA(http.HttpRequest))\
.AndReturn([tenants, False])
@ -226,7 +228,8 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
tenants = self.tenants.list()
api.neutron.tenant_floating_ip_list(IsA(http.HttpRequest),
all_tenants=True).AndReturn(fips)
api.nova.server_list(IsA(http.HttpRequest), search_opts={'all_tenants': True}) \
api.nova.server_list(IsA(http.HttpRequest),
search_opts={'all_tenants': True}) \
.AndReturn([servers, False])
api.keystone.tenant_list(IsA(http.HttpRequest))\
.AndReturn([tenants, False])
@ -254,7 +257,8 @@ class AdminFloatingIpViewTest(test.BaseAdminViewTests):
tenants = self.tenants.list()
api.neutron.tenant_floating_ip_list(IsA(http.HttpRequest),
all_tenants=True).AndReturn(fips)
api.nova.server_list(IsA(http.HttpRequest), search_opts={'all_tenants': True}) \
api.nova.server_list(IsA(http.HttpRequest),
search_opts={'all_tenants': True}) \
.AndReturn([servers, False])
api.keystone.tenant_list(IsA(http.HttpRequest))\
.AndReturn([tenants, False])

12
openstack_dashboard/dashboards/identity/projects/tests.py
View File

@ -1071,7 +1071,8 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
self._check_role_list(keystone_api_version, role_assignments, groups,
proj_users, roles, workflow_data)
quotas.tenant_quota_usages(IsA(http.HttpRequest), tenant_id=project.id) \
quotas.tenant_quota_usages(IsA(http.HttpRequest),
tenant_id=project.id) \
.AndReturn(quota_usages)
nova_updated_quota = {key: updated_quota[key] for key in
@ -1230,7 +1231,8 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
updated_quota = self._get_quota_info(quota)
# handle
quotas.tenant_quota_usages(IsA(http.HttpRequest), tenant_id=project.id) \
quotas.tenant_quota_usages(IsA(http.HttpRequest),
tenant_id=project.id) \
.AndReturn(quota_usages)
api.keystone.get_effective_domain_id(
@ -1362,7 +1364,8 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
self._check_role_list(keystone_api_version, role_assignments, groups,
proj_users, roles, workflow_data)
quotas.tenant_quota_usages(IsA(http.HttpRequest), tenant_id=project.id) \
quotas.tenant_quota_usages(IsA(http.HttpRequest),
tenant_id=project.id) \
.AndReturn(quota_usages)
nova_updated_quota = {key: updated_quota[key] for key in
@ -1475,7 +1478,8 @@ class UpdateProjectWorkflowTests(test.BaseAdminViewTests):
updated_quota = self._get_quota_info(quota)
# handle
quotas.tenant_quota_usages(IsA(http.HttpRequest), tenant_id=project.id) \
quotas.tenant_quota_usages(IsA(http.HttpRequest),
tenant_id=project.id) \
.AndReturn(quota_usages)
api.keystone.get_effective_domain_id(

4
openstack_dashboard/dashboards/project/floating_ips/tests.py
View File

@ -262,7 +262,7 @@ class FloatingIpViewTests(test.TestCase):
IsA(http.HttpRequest), detailed=False) \
.AndReturn([self.servers.list(), False])
quotas.tenant_quota_usages(
IsA(http.HttpRequest), targets=('floating_ips', )).MultipleTimes() \
IsA(http.HttpRequest), targets=('floating_ips', )).MultipleTimes()\
.AndReturn(quota_data)
self.mox.ReplayAll()
@ -300,7 +300,7 @@ class FloatingIpViewTests(test.TestCase):
IsA(http.HttpRequest), detailed=False) \
.AndReturn([self.servers.list(), False])
quotas.tenant_quota_usages(
IsA(http.HttpRequest), targets=('floating_ips', )).MultipleTimes() \
IsA(http.HttpRequest), targets=('floating_ips', )).MultipleTimes()\
.AndReturn(quota_data)
self.mox.ReplayAll()

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

@ -52,7 +52,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/overview/tests.py
View File

@ -52,10 +52,12 @@ class UsageViewTests(test.TestCase):
.AndReturn(nova_stu_enabled)
if tenant_limits_exception:
api.nova.tenant_absolute_limits(IsA(http.HttpRequest), reserved=True)\
api.nova.tenant_absolute_limits(IsA(http.HttpRequest),
reserved=True) \
.AndRaise(tenant_limits_exception)
else:
api.nova.tenant_absolute_limits(IsA(http.HttpRequest), reserved=True) \
api.nova.tenant_absolute_limits(IsA(http.HttpRequest),
reserved=True) \
.AndReturn(self.limits['absolute'])
if nova_stu_enabled:

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

@ -36,7 +36,8 @@ class RouterMixin(object):
})
def _get_detail(self, router, extraroute=True, lookup_l3=False,
support_l3_agent=True):
api.neutron.is_extension_supported(IsA(http.HttpRequest), 'extraroute')\
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'extraroute')\
.MultipleTimes().AndReturn(extraroute)
if lookup_l3:
api.neutron.is_extension_supported(IsA(http.HttpRequest),
@ -50,8 +51,8 @@ class RouterMixin(object):
self._mock_external_network_get(router)
if lookup_l3 and support_l3_agent:
agent = self.agents.list()[1]
api.neutron.list_l3_agent_hosting_router(IsA(http.HttpRequest), router.id)\
.AndReturn([agent])
api.neutron.list_l3_agent_hosting_router(
IsA(http.HttpRequest), router.id).AndReturn([agent])
self.mox.ReplayAll()
res = self.client.get(reverse('horizon:%s'
@ -770,7 +771,8 @@ class RouterRouteTests(RouterMixin, test.TestCase):
pre_router = self.routers_with_routes.first()
post_router = copy.deepcopy(pre_router)
route = post_router['routes'].pop()
api.neutron.is_extension_supported(IsA(http.HttpRequest), 'extraroute')\
api.neutron.is_extension_supported(IsA(http.HttpRequest),
'extraroute')\
.MultipleTimes().AndReturn(True)
api.neutron.router_get(IsA(http.HttpRequest),
pre_router.id).AndReturn(pre_router)

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

@ -388,7 +388,7 @@ class StackTests(test.TestCase):
}
api.heat.template_validate(IsA(http.HttpRequest),
files={},
template=hc_format.parse(template['data'])) \
template=hc_format.parse(template['data']))\
.AndReturn(template['validate'])
self.mox.ReplayAll()
@ -475,7 +475,7 @@ class StackTests(test.TestCase):
}
api.heat.template_validate(IsA(http.HttpRequest),
files={},
template=hc_format.parse(template['data'])) \
template=hc_format.parse(template['data']))\
.AndReturn(template['validate'])
self.mox.ReplayAll()
@ -550,7 +550,7 @@ class StackTests(test.TestCase):
api.heat.template_validate(IsA(http.HttpRequest),
files={},
template=hc_format.parse(template['data'])) \
template=hc_format.parse(template['data']))\
.AndReturn(template['validate'])
api.heat.stack_create(IsA(http.HttpRequest),

4
openstack_dashboard/dashboards/project/volumes/tests.py
View File

@ -117,8 +117,8 @@ class VolumeViewTests(test.ResetImageAPIVersionMixin, test.TestCase):
AndReturn([self.servers.list(), False])
api.nova.server_get(IsA(http.HttpRequest),
server.id).AndReturn(server)
api.cinder.tenant_absolute_limits(IsA(http.HttpRequest)).MultipleTimes().\
AndReturn(self.cinder_limits['absolute'])
api.cinder.tenant_absolute_limits(IsA(http.HttpRequest))\
.MultipleTimes().AndReturn(self.cinder_limits['absolute'])
self.mox.ReplayAll()
res = self.client.get(urlunquote(url))

3
openstack_dashboard/test/api_tests/neutron_tests.py
View File

@ -361,7 +361,8 @@ class NeutronApiTests(test.APITestCase):
'prefixes': subnetpool_data['prefixes']}
neutronclient = self.stub_neutronclient()
neutronclient.update_subnetpool(subnetpool_id, body={'subnetpool': params})\
neutronclient.update_subnetpool(subnetpool_id,
body={'subnetpool': params})\
.AndReturn({'subnetpool': subnetpool_data})
self.mox.ReplayAll()

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)

4
tox.ini
View File

@ -137,7 +137,9 @@ commands =
[flake8]
exclude = .venv,.git,.tox,dist,*lib/python*,*egg,build,panel_template,dash_template,local_settings.py,*/local/*,*/test/test_plugins/*,.ropeproject,node_modules
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
# H203 Use assertIs(Not)None to check for None
# H904 Delay string interpolations at logging calls