From 10caa1e101a04525559f104d651ab5b2cd8108c2 Mon Sep 17 00:00:00 2001 From: uchenily Date: Wed, 2 Mar 2022 08:16:48 +0000 Subject: [PATCH] Mock netutils.is_ipv6_enabled() method when testing Mock netutils.is_ipv6_enabled() to prevent unittest results from being affected by /proc/sys/net/ipv6/conf/default/disable_ipv6 values Closes-Bug: #1962714 Change-Id: I3b6175eb0db6e4a791f8fa686b491a448ebf4ad9 --- neutron/tests/unit/agent/linux/test_dhcp.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/neutron/tests/unit/agent/linux/test_dhcp.py b/neutron/tests/unit/agent/linux/test_dhcp.py index ff1777266e1..2633afb65f2 100644 --- a/neutron/tests/unit/agent/linux/test_dhcp.py +++ b/neutron/tests/unit/agent/linux/test_dhcp.py @@ -25,6 +25,7 @@ from neutron_lib import fixture as lib_fixtures from oslo_config import cfg import oslo_messaging from oslo_utils import fileutils +from oslo_utils import netutils from oslo_utils import uuidutils import testtools @@ -3059,6 +3060,8 @@ class TestDeviceManager(TestConfBase): 'load_interface_driver') self.mock_ip_lib = ip_lib_patcher.start() self.mock_load_interface_driver = load_interface_driver_patcher.start() + mock.patch.object(netutils, 'is_ipv6_enabled', + return_value=True).start() def _test_setup(self, load_interface_driver, ip_lib, use_gateway_ips): with mock.patch.object(dhcp.ip_lib, 'IPDevice') as mock_IPDevice: