diff --git a/neutron/tests/base.py b/neutron/tests/base.py index 2eb12e067f9..94f67437cd4 100644 --- a/neutron/tests/base.py +++ b/neutron/tests/base.py @@ -525,8 +525,7 @@ class BaseTestCase(DietTestCase): if e: if raise_on_exception: raise e - else: - threads_exceptions.append(e) + threads_exceptions.append(e) return threads_exceptions diff --git a/neutron/tests/fullstack/schedulers/dhcp.py b/neutron/tests/fullstack/schedulers/dhcp.py index 96a7c9b7bdc..e96291dcd67 100644 --- a/neutron/tests/fullstack/schedulers/dhcp.py +++ b/neutron/tests/fullstack/schedulers/dhcp.py @@ -40,8 +40,7 @@ class AlwaysTheOtherAgentScheduler(base_scheduler.BaseChanceScheduler, for agent in resource_hostable_agents: if agent.id in self.last_selected_agent_ids: continue - else: - possible_agents.append(agent) + possible_agents.append(agent) num_agents = min(len(possible_agents), num_agents_needed) self.last_selected_agent_ids = [ ag.id for ag in possible_agents[0:num_agents]] diff --git a/neutron/tests/functional/agent/common/test_ovs_lib.py b/neutron/tests/functional/agent/common/test_ovs_lib.py index db806cec1f8..374b8e692ad 100644 --- a/neutron/tests/functional/agent/common/test_ovs_lib.py +++ b/neutron/tests/functional/agent/common/test_ovs_lib.py @@ -83,8 +83,7 @@ class BaseOVSTestCase(base.BaseSudoTestCase): for queue in (queue for queue in queues if queue['_uuid'] == queue_id): return queue - else: - return None + return None return queues def _create_queue(self, @@ -121,8 +120,7 @@ class BaseOVSTestCase(base.BaseSudoTestCase): if qos_id: for qos in (qos for qos in qoses if qos['_uuid'] == qos_id): return qos - else: - return None + return None return qoses def _create_bridge(self, br_name=None): diff --git a/neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py b/neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py index 9a7fb81eac5..6058e711c0e 100644 --- a/neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py +++ b/neutron/tests/functional/agent/ovn/metadata/test_metadata_agent.py @@ -401,9 +401,8 @@ class TestMetadataAgent(base.TestOVNFunctionalBase): for rule in iptables_mgr.get_rules_for_table('mangle'): if regex.match(rule): return - else: - self.fail('Rule not found in "mangle" table, in namespace %s' % - namespace) + self.fail('Rule not found in "mangle" table, in namespace %s' % + namespace) def test_metadata_proxy_handler_idl(self): # This test relies on the configuration option metadata_workers=0 diff --git a/neutron/tests/functional/agent/test_ovs_flows.py b/neutron/tests/functional/agent/test_ovs_flows.py index 130ef426e93..08dcc9daffc 100644 --- a/neutron/tests/functional/agent/test_ovs_flows.py +++ b/neutron/tests/functional/agent/test_ovs_flows.py @@ -66,7 +66,7 @@ class OVSAgentTestBase(test_ovs_lib.OVSBridgeTestBase, (l, sep, r) = line.partition(':') if not sep: continue - elif l in required_keys: + if l in required_keys: trace[l] = r for k in required_keys: if k not in trace: diff --git a/neutron/tests/functional/privileged/agent/linux/test_ip_lib.py b/neutron/tests/functional/privileged/agent/linux/test_ip_lib.py index 899b1f34f45..44606040a49 100644 --- a/neutron/tests/functional/privileged/agent/linux/test_ip_lib.py +++ b/neutron/tests/functional/privileged/agent/linux/test_ip_lib.py @@ -204,8 +204,7 @@ class GetLinkDevicesTestCase(functional_base.BaseSudoTestCase): for device in priv_ip_lib.get_link_devices(namespace): if interface_name == linux_utils.get_attr(device, 'IFLA_IFNAME'): return device - else: - self.fail('Interface "%s" not found' % interface_name) + self.fail('Interface "%s" not found' % interface_name) def test_get_link_devices_veth_different_namespaces(self): namespace2 = 'ns_test-' + uuidutils.generate_uuid() @@ -280,8 +279,7 @@ class BaseIpRuleTestCase(functional_base.BaseSudoTestCase): else: if raise_exception: self.fail('Rule with %s was expected' % exception_string) - else: - return False + return False class ListIpRulesTestCase(BaseIpRuleTestCase): diff --git a/neutron/tests/unit/conf/policies/test_base.py b/neutron/tests/unit/conf/policies/test_base.py index eae85d0927a..c930c804e6e 100644 --- a/neutron/tests/unit/conf/policies/test_base.py +++ b/neutron/tests/unit/conf/policies/test_base.py @@ -121,16 +121,14 @@ class RuleScopesTestCase(PolicyBaseTestCase): if len(rule.scope_types) == 1: # If rule has only one scope, it's fine continue - else: - expected_scope_types = SCOPE_TYPES_EXCEPTIONS.get( - rule_name, []) - fail_msg = ( - "Rule %s have scope types %s which are not defined " - "in the exceptions list: %s" % ( - rule_name, rule.scope_types, expected_scope_types)) - self.assertListEqual(expected_scope_types, - rule.scope_types, - fail_msg) + expected_scope_types = SCOPE_TYPES_EXCEPTIONS.get(rule_name, []) + fail_msg = ( + "Rule %s have scope types %s which are not defined " + "in the exceptions list: %s" % ( + rule_name, rule.scope_types, expected_scope_types)) + self.assertListEqual(expected_scope_types, + rule.scope_types, + fail_msg) def write_policies(policies): diff --git a/neutron/tests/unit/db/test_ipam_pluggable_backend.py b/neutron/tests/unit/db/test_ipam_pluggable_backend.py index 958c0abbc62..6139a2531a4 100644 --- a/neutron/tests/unit/db/test_ipam_pluggable_backend.py +++ b/neutron/tests/unit/db/test_ipam_pluggable_backend.py @@ -126,8 +126,7 @@ class TestDbBasePluginIpam(test_db_base.NeutronDbPluginV2TestCase): if isinstance(request, ipam_req.SpecificAddressRequest): if request.address == netaddr.IPAddress(fail_ip): raise exception - else: - return str(request.address), subnet_id + return str(request.address), subnet_id else: return auto_ip, subnet_id diff --git a/neutron/tests/unit/db/test_l3_dvr_db.py b/neutron/tests/unit/db/test_l3_dvr_db.py index 010ff247a9f..6767127bc0d 100644 --- a/neutron/tests/unit/db/test_l3_dvr_db.py +++ b/neutron/tests/unit/db/test_l3_dvr_db.py @@ -1451,8 +1451,7 @@ class L3DvrTestCase(test_db_base_plugin_v2.NeutronDbPluginV2TestCase): call_info['count'] += 1 if call_info['count'] == 2: raise RuntimeError() - else: - return orig_update_port(*args, **kwargs) + return orig_update_port(*args, **kwargs) # NOTE(trananhkma): expect that update_port() only raises an error # at the 2nd function call (Update owner after actual process