openstack
/
octavia
Code Issues Proposed changes

Fix pyroute2.netns mock in some tests 

With pyroute 0.6.11 the netns module import has been refactored so that
it is no longer available as an attribute. Adapt our mocks accordingly
so that the unit tests continue to work with both older versions and the
new one.

Change-Id: Ic953d5a63f630e556af0fde7096fe3d686eff06c
This commit is contained in:
Dr. Jens Harbott 2022-06-08 22:18:10 +02:00 committed by Michael Johnson
parent d590d6c705
commit 66d7b6c7d1
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
octavia/tests/unit/amphorae/backends/agent/api_server/test_plug.py
View File

@ -95,15 +95,13 @@ class TestPlug(base.TestCase):
@mock.patch('pyroute2.NSPopen', create=True)
@mock.patch.object(plug, "webob")
@mock.patch('pyroute2.IPRoute', create=True)
@mock.patch('pyroute2.netns.create', create=True)
@mock.patch('pyroute2.NetNS', create=True)
@mock.patch('subprocess.check_output')
@mock.patch('shutil.copytree')
@mock.patch('os.makedirs')
def test_plug_vip_ipv4(self, mock_makedirs, mock_copytree,
mock_check_output, mock_netns, mock_netns_create,
mock_pyroute2, mock_webob, mock_nspopen,
mock_by_mac):
mock_check_output, mock_netns, mock_pyroute2,
mock_webob, mock_nspopen, mock_by_mac):
m = mock.mock_open()
with mock.patch('os.open'), mock.patch.object(os, 'fdopen', m):
self.test_plug.plug_vip(
@ -134,15 +132,13 @@ class TestPlug(base.TestCase):
@mock.patch('pyroute2.NSPopen', create=True)
@mock.patch.object(plug, "webob")
@mock.patch('pyroute2.IPRoute', create=True)
@mock.patch('pyroute2.netns.create', create=True)
@mock.patch('pyroute2.NetNS', create=True)
@mock.patch('subprocess.check_output')
@mock.patch('shutil.copytree')
@mock.patch('os.makedirs')
def test_plug_vip_ipv6(self, mock_makedirs, mock_copytree,
mock_check_output, mock_netns, mock_netns_create,
mock_pyroute2, mock_webob, mock_nspopen,
mock_by_mac):
mock_check_output, mock_netns, mock_pyroute2,
mock_webob, mock_nspopen, mock_by_mac):
conf = self.useFixture(oslo_fixture.Config(cfg.CONF))
conf.config(group='controller_worker',
loadbalancer_topology=constants.TOPOLOGY_ACTIVE_STANDBY)
@ -174,14 +170,13 @@ class TestPlug(base.TestCase):
@mock.patch.object(plug, "webob")
@mock.patch('pyroute2.IPRoute', create=True)
@mock.patch('pyroute2.netns.create', create=True)
@mock.patch('pyroute2.NetNS', create=True)
@mock.patch('subprocess.check_output')
@mock.patch('shutil.copytree')
@mock.patch('os.makedirs')
def test_plug_vip_bad_ip(self, mock_makedirs, mock_copytree,
mock_check_output, mock_netns, mock_netns_create,
mock_pyroute2, mock_webob):
mock_check_output, mock_netns, mock_pyroute2,
mock_webob):
m = mock.mock_open()
with mock.patch('os.open'), mock.patch.object(os, 'fdopen', m):
self.test_plug.plug_vip(