From 567cf7b140d404828c9fa9b4af44258834aa1002 Mon Sep 17 00:00:00 2001 From: Brian Haley Date: Thu, 14 Jan 2016 14:42:14 -0500 Subject: [PATCH] Fix Linux bridge test_report_state_revived failure on OSX Mock-out the Linux-specific bridge check in the class so it succeeds on all OSes. Change-Id: Id48845b3e73caa7ea6fad692feb21dc1f2b12ecc Closes-Bug: #1534281 --- .../linuxbridge/agent/test_linuxbridge_neutron_agent.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py index 0fc3b5cd5..a49e7a3f4 100644 --- a/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py +++ b/neutron/tests/unit/plugins/ml2/drivers/linuxbridge/agent/test_linuxbridge_neutron_agent.py @@ -121,6 +121,10 @@ class TestLinuxBridgeAgent(base.BaseTestCase): 'get_interface_mac') self.get_mac = self.get_mac_p.start() self.get_mac.return_value = '00:00:00:00:00:01' + self.get_bridge_names_p = mock.patch.object(bridge_lib, + 'get_bridge_names') + self.get_bridge_names = self.get_bridge_names_p.start() + self.get_bridge_names.return_value = ["br-int", "brq1"] with mock.patch.object(ip_lib.IPWrapper, 'get_device_by_ip', return_value=FAKE_DEFAULT_DEV): -- 2.45.2