diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-01-12 11:01:02 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-01-12 11:01:03 +0000 |
| commit | 25517d0226e69bbabf9679c80445746a5cab846d (patch) | |
| tree | 5f16a4c3414cf595d84fc451696f31b4f772fa6e /ceilometerclient/tests/unit/v2/test_shell.py | |
| parent | d3a048311ac7ac7986a6b1478c5b399e1727a7bb (diff) | |
| parent | 71cb6b3d0ee1f393c2bafee13aa2f013cc82f77d (diff) | |
| download | python-ceilometerclient-2.2.0.tar.gz | |
Merge "Don't copy the auth_plugin for aodh"2.2.0
Diffstat (limited to 'ceilometerclient/tests/unit/v2/test_shell.py')
| -rw-r--r-- | ceilometerclient/tests/unit/v2/test_shell.py | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/ceilometerclient/tests/unit/v2/test_shell.py b/ceilometerclient/tests/unit/v2/test_shell.py index a4209f7..bdcabee 100644 --- a/ceilometerclient/tests/unit/v2/test_shell.py +++ b/ceilometerclient/tests/unit/v2/test_shell.py @@ -1235,9 +1235,9 @@ class ShellShadowedArgsTest(test_shell.ShellTestBase): '--user-id', 'the-user-id-i-want-to-set', '--name', 'project-id-test'] + args with mock.patch.object(alarms.AlarmManager, method) as mocked: - with mock.patch('ceilometerclient.client.AuthPlugin.' - 'redirect_to_aodh_endpoint') as redirect_aodh: - redirect_aodh.site_effect = exceptions.EndpointNotFound + with mock.patch('ceilometerclient.openstack.common.apiclient.' + 'client.HTTPClient.client_request') as request: + request.site_effect = exceptions.EndpointNotFound base_shell.main(cli_args) args, kwargs = mocked.call_args self.assertEqual('the-project-id-i-want-to-set', @@ -1279,9 +1279,9 @@ class ShellShadowedArgsTest(test_shell.ShellTestBase): '--meter-unit', 'ns', '--sample-volume', '10086', ] - with mock.patch('ceilometerclient.client.AuthPlugin.' - 'redirect_to_aodh_endpoint') as redirect_aodh: - redirect_aodh.site_effect = exceptions.EndpointNotFound + with mock.patch('ceilometerclient.openstack.common.apiclient.client.' + 'HTTPClient.client_request') as client_request: + client_request.site_effect = exceptions.EndpointNotFound base_shell.main(cli_args) args, kwargs = mocked.call_args self.assertEqual('the-project-id-i-want-to-set', |