openstack
/
neutron
Code Issues Proposed changes

Merge "Remove unused arguments in test methods"

This commit is contained in:
Zuul 2019-12-18 04:38:03 +00:00 committed by Gerrit Code Review
parent b869f30e0b df401ddca1
commit 0db38cf8a8
1 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
neutron/tests/unit/agent/linux/test_interface.py
View File

@ -491,13 +491,11 @@ class TestOVSInterfaceDriver(TestBase):
mtu=9000)
delete_port.assert_called_once_with('tap0')
def test_unplug(self, bridge=None):
if not bridge:
bridge = 'br-int'
def test_unplug(self):
with mock.patch('neutron.agent.common.ovs_lib.OVSBridge') as ovs_br:
ovs = interface.OVSInterfaceDriver(self.conf)
ovs.unplug('tap0')
ovs_br.assert_has_calls([mock.call(bridge),
ovs_br.assert_has_calls([mock.call('br-int'),
mock.call().delete_port('tap0')])
@ -567,15 +565,14 @@ class TestOVSInterfaceDriverWithVeth(TestOVSInterfaceDriver):
root_dev.assert_has_calls([mock.call.link.set_up()])
ns_dev.assert_has_calls([mock.call.link.set_up()])
def test_plug_new(self, bridge=None, namespace=None):
def test_plug_new(self):
# The purpose of test_plug_new in parent class(TestOVSInterfaceDriver)
# is to test exception(exceptions.ProcessExecutionError), method here
# would not go through that code, So just pass
pass
def test_unplug(self, bridge=None):
if not bridge:
bridge = 'br-int'
def test_unplug(self):
bridge = 'br-int'
with mock.patch('neutron.agent.common.ovs_lib.OVSBridge') as ovs_br:
ovs = interface.OVSInterfaceDriver(self.conf)
ovs.unplug('ns-0', bridge=bridge)