diff options
Diffstat (limited to 'ceilometerclient/tests/unit/test_client.py')
| -rw-r--r-- | ceilometerclient/tests/unit/test_client.py | 28 |
1 files changed, 14 insertions, 14 deletions
diff --git a/ceilometerclient/tests/unit/test_client.py b/ceilometerclient/tests/unit/test_client.py index 9eb7f17..174037b 100644 --- a/ceilometerclient/tests/unit/test_client.py +++ b/ceilometerclient/tests/unit/test_client.py @@ -12,10 +12,10 @@ import types -from keystoneclient.auth.identity import v2 as v2_auth -from keystoneclient.auth.identity import v3 as v3_auth -from keystoneclient import exceptions as ks_exc -from keystoneclient import session as ks_session +from keystoneauth1 import exceptions as ks_exc +from keystoneauth1.identity import v2 as v2_auth +from keystoneauth1.identity import v3 as v3_auth +from keystoneauth1 import session as ks_session import mock import requests @@ -258,8 +258,8 @@ class ClientAuthTest(utils.BaseTestCase): return_value=mock.MagicMock()): return client.get_client(api_version, **env) - @mock.patch('keystoneclient.discover.Discover') - @mock.patch('keystoneclient.session.Session') + @mock.patch('keystoneauth1.discover.Discover') + @mock.patch('keystoneauth1.session.Session') def test_discover_auth_versions(self, session, discover_mock): env = FAKE_ENV.copy() env.pop('auth_plugin', None) @@ -271,13 +271,13 @@ class ClientAuthTest(utils.BaseTestCase): client.auth_plugin.opts.pop('token', None) client.auth_plugin._do_authenticate(mock.MagicMock()) - self.assertEqual([mock.call(auth_url='http://no.where', + self.assertEqual([mock.call(url='http://no.where', session=mock_session_instance)], discover_mock.call_args_list) self.assertIsInstance(mock_session_instance.auth, v3_auth.Password) - @mock.patch('keystoneclient.discover.Discover') - @mock.patch('keystoneclient.session.Session') + @mock.patch('keystoneauth1.discover.Discover') + @mock.patch('keystoneauth1.session.Session') def test_discover_auth_versions_v2_only(self, session, discover): env = FAKE_ENV.copy() env.pop('auth_plugin', None) @@ -297,14 +297,14 @@ class ClientAuthTest(utils.BaseTestCase): client = self.create_client(env) client.auth_plugin.opts.pop('token', None) client.auth_plugin._do_authenticate(mock.MagicMock()) - self.assertEqual([mock.call(auth_url='http://no.where', + self.assertEqual([mock.call(url='http://no.where', session=session_instance_mock)], discover.call_args_list) self.assertIsInstance(session_instance_mock.auth, v2_auth.Password) - @mock.patch('keystoneclient.discover.Discover') - @mock.patch('keystoneclient.session.Session') + @mock.patch('keystoneauth1.discover.Discover') + @mock.patch('keystoneauth1.session.Session') def test_discover_auth_versions_raise_discovery_failure(self, session, discover): @@ -331,9 +331,9 @@ class ClientAuthTest(utils.BaseTestCase): self.assertRaises(ks_exc.DiscoveryFailure, client.auth_plugin._do_authenticate, mock.Mock()) - self.assertEqual([mock.call(auth_url='http://no.where', + self.assertEqual([mock.call(url='http://no.where', session=session_instance_mock), - mock.call(auth_url='http://no.where', + mock.call(url='http://no.where', session=session_instance_mock)], discover.call_args_list) |