diff --git a/neutron/tests/unit/extensions/test_segment.py b/neutron/tests/unit/extensions/test_segment.py index 433ce758e4f..267e688aeb0 100644 --- a/neutron/tests/unit/extensions/test_segment.py +++ b/neutron/tests/unit/extensions/test_segment.py @@ -2301,16 +2301,17 @@ class PlacementAPIClientTestCase(base.DietTestCase): self.mock_request = self.mock_request_p.start() self.client = placement_client.PlacementAPIClient() - @mock.patch('keystoneauth1.session.Session') + @mock.patch('keystoneauth1.loading.load_session_from_conf_options') @mock.patch('keystoneauth1.loading.load_auth_from_conf_options') - def test_constructor(self, load_auth_mock, ks_sess_mock): + def test_constructor(self, load_auth_mock, load_sess_mock): + mock_auth = mock.Mock() + load_auth_mock.return_value = mock_auth + placement_client.PlacementAPIClient() load_auth_mock.assert_called_once_with(cfg.CONF, 'placement') - ks_sess_mock.assert_called_once_with(auth=load_auth_mock.return_value, - cert=None, - timeout=None, - verify=True) + load_sess_mock.assert_called_once_with( + cfg.CONF, 'placement', auth=mock_auth) def test_create_resource_provider(self): expected_payload = 'fake_resource_provider' diff --git a/neutron/tests/unit/plugins/ml2/extensions/test_dns_integration.py b/neutron/tests/unit/plugins/ml2/extensions/test_dns_integration.py index 71dfca6e9d5..f59f0187688 100644 --- a/neutron/tests/unit/plugins/ml2/extensions/test_dns_integration.py +++ b/neutron/tests/unit/plugins/ml2/extensions/test_dns_integration.py @@ -804,9 +804,9 @@ class TestDesignateClientKeystoneV2(testtools.TestCase): True, group='designate') driver.get_clients(self.TEST_CONTEXT) - self.driver_session.assert_called_with(cert=None, - timeout=None, - verify=False) + args, kwargs = self.driver_session.call_args + self.assertIn('verify', kwargs) + self.assertFalse(kwargs['verify'], False) def test_secure_client(self): cfg.CONF.set_override('insecure', @@ -816,9 +816,9 @@ class TestDesignateClientKeystoneV2(testtools.TestCase): self.TEST_CA_CERT, group='designate') driver.get_clients(self.TEST_CONTEXT) - self.driver_session.assert_called_with(cert=None, - timeout=None, - verify=self.TEST_CA_CERT) + args, kwargs = self.driver_session.call_args + self.assertIn('verify', kwargs) + self.assertEqual(kwargs['verify'], self.TEST_CA_CERT) def test_auth_type_not_defined(self): driver.get_clients(self.TEST_CONTEXT) @@ -892,9 +892,9 @@ class TestDesignateClientKeystoneV3(testtools.TestCase): True, group='designate') driver.get_clients(self.TEST_CONTEXT) - self.driver_session.assert_called_with(cert=None, - timeout=None, - verify=False) + args, kwargs = self.driver_session.call_args + self.assertIn('verify', kwargs) + self.assertFalse(kwargs['verify'], False) def test_secure_client(self): cfg.CONF.set_override('insecure', @@ -904,9 +904,9 @@ class TestDesignateClientKeystoneV3(testtools.TestCase): self.TEST_CA_CERT, group='designate') driver.get_clients(self.TEST_CONTEXT) - self.driver_session.assert_called_with(cert=None, - timeout=None, - verify=self.TEST_CA_CERT) + args, kwargs = self.driver_session.call_args + self.assertIn('verify', kwargs) + self.assertEqual(kwargs['verify'], self.TEST_CA_CERT) def test_auth_type_password(self): driver.get_clients(self.TEST_CONTEXT)