From 4efc78557d11ac476b5e96f4d8ef36902b6e3e44 Mon Sep 17 00:00:00 2001 From: YAMAMOTO Takashi Date: Wed, 4 Mar 2015 14:29:22 +0900 Subject: [PATCH] OVS UT: Remove useless return_value for setup_integration_br Align UTs to the reality, where setup_integration_br does not return any value. Change-Id: I79a5b6da8e6114215fba3cb4c2260e48a79db764 --- .../tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py | 3 +-- neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py | 6 ++---- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py index 1e2ead58f..9fb0fdacf 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py +++ b/neutron/tests/unit/openvswitch/test_ovs_dvr_neutron_agent.py @@ -67,8 +67,7 @@ class TestOvsDvrNeutronAgent(base.BaseTestCase): with contextlib.nested( mock.patch('neutron.plugins.openvswitch.agent.ovs_neutron_agent.' - 'OVSNeutronAgent.setup_integration_br', - return_value=mock.Mock()), + 'OVSNeutronAgent.setup_integration_br'), mock.patch('neutron.plugins.openvswitch.agent.ovs_neutron_agent.' 'OVSNeutronAgent.setup_ancillary_bridges', return_value=[]), diff --git a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py index 03463d35d..5a192e37a 100644 --- a/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py +++ b/neutron/tests/unit/openvswitch/test_ovs_neutron_agent.py @@ -111,8 +111,7 @@ class TestOvsNeutronAgent(base.BaseTestCase): with contextlib.nested( mock.patch('neutron.plugins.openvswitch.agent.ovs_neutron_agent.' - 'OVSNeutronAgent.setup_integration_br', - return_value=mock.Mock()), + 'OVSNeutronAgent.setup_integration_br'), mock.patch('neutron.plugins.openvswitch.agent.ovs_neutron_agent.' 'OVSNeutronAgent.setup_ancillary_bridges', return_value=[]), @@ -1094,8 +1093,7 @@ class AncillaryBridgesTest(base.BaseTestCase): with contextlib.nested( mock.patch('neutron.plugins.openvswitch.agent.ovs_neutron_agent.' - 'OVSNeutronAgent.setup_integration_br', - return_value=mock.Mock()), + 'OVSNeutronAgent.setup_integration_br'), mock.patch('neutron.agent.linux.utils.get_interface_mac', return_value='00:00:00:00:00:01'), mock.patch('neutron.agent.linux.ovs_lib.OVSBridge.' -- 2.45.2