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

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 1e2ead58f4022fa2b9e0b238d3e9ec91fe42b2fb..9fb0fdacf2fa4a38e0b49153c3b130cf097227ca 100644 (file)
--- 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 03463d35d18ccf53a42cb9bc4e234b9b93787237..5a192e37a5dc6e81cb9656767a297005a41ff532 100644 (file)
--- 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.'