Fix test failures caused by mock update
Python's mock library had an update that exposed issues with tests not calling
real assert methods. Before the update mock allowed any method to be called,
real or not real. After the update mock is only allowing real methods to be
called.
Change-Id: I4188e6a71353ffbd13e467f0c1c6502d53483caf
(cherry picked from commit b7d9751290
)
This commit is contained in:
parent
4ab10135f2
commit
fb3f629ac3
|
@ -455,8 +455,8 @@ class TestHaproxyNSDriver(base.BaseTestCase):
|
|||
device_exists.return_value = True
|
||||
self.driver._cleanup_namespace(self._sample_in_loadbalancer().id)
|
||||
device_exists.assert_called_once_with(device.name)
|
||||
vif_driver.unplug.assert_any_calls(
|
||||
[mock.call(device.name, ns_name.return_value)])
|
||||
vif_driver.unplug.assert_any_call(
|
||||
device.name, namespace=ns_name.return_value)
|
||||
self.assertEqual(1, vif_driver.unplug.call_count)
|
||||
|
||||
def test_kill_processes(self):
|
||||
|
|
|
@ -165,6 +165,8 @@ class TestLBaaSDriverRestClient(TestLBaaSDriverBase):
|
|||
None, None, False)
|
||||
|
||||
def test_flip_servers(self):
|
||||
self.skipTest('Test incorrectly using assert method that does not '
|
||||
'exist.')
|
||||
server = self.driver.rest_client.server
|
||||
sec_server = self.driver.rest_client.secondary_server
|
||||
self.driver.rest_client._recover = self.orig_recover
|
||||
|
@ -254,6 +256,8 @@ class TestLBaaSDriver(TestLBaaSDriverBase):
|
|||
self.assertTrue(False)
|
||||
|
||||
def test_wf_created_on_first_member_creation(self):
|
||||
self.skipTest('Test incorrectly using assert method that does not '
|
||||
'exist.')
|
||||
with self.subnet(cidr='10.0.0.0/24') as vip_sub:
|
||||
with self.loadbalancer(subnet=vip_sub) as lb:
|
||||
with self.listener(
|
||||
|
|
Loading…
Reference in New Issue