Merge "Fix UT BridgeLibTest when IPv6 is disabled" into stable/queens

2018-07-20 04:16:16 +00:00
parent f113502020 f001b273b7
commit 2e609e08cf
1 changed files with 3 additions and 0 deletions
--- a/neutron/tests/unit/agent/linux/test_bridge_lib.py
+++ b/neutron/tests/unit/agent/linux/test_bridge_lib.py
@@ -29,6 +29,9 @@ class BridgeLibTest(base.BaseTestCase):

    def setUp(self):
        super(BridgeLibTest, self).setUp()
+        mock.patch(
+            'neutron.common.ipv6_utils.is_enabled_and_bind_by_default',
+            return_value=True).start()
        ip_wrapper = mock.patch('neutron.agent.linux.ip_lib.IPWrapper').start()
        self.execute = ip_wrapper.return_value.netns.execute