openstack
/
neutron
Code Issues Proposed changes

tests: clean up designate client session mock on test exit 

This test was modifying the driver session method without making an
effort to restore the original value after the test case completion.
This resulted in two consequent tests that relied on the method that
were triggered in the same test thread, to trigger a failure for one of
them.

Changed the setup logic for the test class to use mock.patch(..).start()
instead.

Closes-Bug: #1593647
Change-Id: I08be90691b5417025c40c5a18308d820dc7a43d2
This commit is contained in:
Ihar Hrachyshka 2016-06-20 09:38:13 +02:00
parent dab8083542
commit 3703b31eea
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
neutron/tests/unit/plugins/ml2/extensions/test_dns_integration.py
View File

@ -538,14 +538,18 @@ class TestDesignateClient(testtools.TestCase):
self.TEST_ADMIN_TENANT_NAME,
group='designate')
driver.session.Session = mock.MagicMock()
# enforce session recalculation
mock.patch.object(driver, '_SESSION', new=None).start()
self.driver_session = (
mock.patch.object(driver.session, 'Session').start()
)
def test_insecure_client(self):
config.cfg.CONF.set_override('insecure',
True,
group='designate')
driver.get_clients(self.TEST_CONTEXT)
driver.session.Session.assert_called_with(verify=False)
self.driver_session.assert_called_with(verify=False)
def test_secure_client(self):
config.cfg.CONF.set_override('insecure',
@ -555,4 +559,4 @@ class TestDesignateClient(testtools.TestCase):
self.TEST_CA_CERT,
group='designate')
driver.get_clients(self.TEST_CONTEXT)
driver.session.Session.assert_called_with(verify=self.TEST_CA_CERT)
self.driver_session.assert_called_with(verify=self.TEST_CA_CERT)