diff --git a/neutron_tempest_plugin/fwaas/common/fwaas_v2_client.py b/neutron_tempest_plugin/fwaas/common/fwaas_v2_client.py index 767afc06..44b09527 100644 --- a/neutron_tempest_plugin/fwaas/common/fwaas_v2_client.py +++ b/neutron_tempest_plugin/fwaas/common/fwaas_v2_client.py @@ -136,7 +136,7 @@ class FWaaSClientMixin(object): nl_constants.PENDING_UPDATE]) def _wait_firewall_group_while(self, firewall_group_id, statuses, - not_found_ok=False): + not_found_ok=False): start = int(time.time()) if not_found_ok: expected_exceptions = (lib_exc.NotFound) diff --git a/neutron_tempest_plugin/scenario/base.py b/neutron_tempest_plugin/scenario/base.py index d87a365a..4b2ddcd5 100644 --- a/neutron_tempest_plugin/scenario/base.py +++ b/neutron_tempest_plugin/scenario/base.py @@ -170,8 +170,8 @@ class BaseTempestTestCase(base_api.BaseNetworkTest): client = client or cls.os_primary.interfaces_client client.delete_interface(server_id, port_id=port_id) - def setup_network_and_server( - self, router=None, server_name=None, network=None, **kwargs): + def setup_network_and_server(self, router=None, server_name=None, + network=None, **kwargs): """Create network resources and a server. Creating a network, subnet, router, keypair, security group diff --git a/tox.ini b/tox.ini index daf728a5..bba37bb7 100644 --- a/tox.ini +++ b/tox.ini @@ -55,12 +55,11 @@ basepython = python3 commands = oslo_debug_helper -t neutron_tempest_plugin/ {posargs} [flake8] -# E125 continuation line does not distinguish itself from next logical line # E126 continuation line over-indented for hanging indent # E128 continuation line under-indented for visual indent # E129 visually indented line with same indent as next logical line # N530 direct neutron imports not allowed -ignore = E125,E126,E128,E129,N530 +ignore = E126,E128,E129,N530 # H106: Don't put vim configuration in source files # H203: Use assertIs(Not)None to check for None # H204: Use assert(Not)Equal to check for equality