summaryrefslogtreecommitdiff
path: root/ceilometerclient/tests/unit/v2/test_shell.py
diff options
context:
space:
mode:
authorSteve Martinelli <s.martinelli@gmail.com>2016-10-29 18:05:26 +0200
committerSteve Martinelli <s.martinelli@gmail.com>2016-11-04 19:18:45 -0500
commitc1141ed5be72ee169a7640b5d4957bfe02ad37ce (patch)
treefc6b0ab67f1422d1910ecbee35d5db10ded2bf41 /ceilometerclient/tests/unit/v2/test_shell.py
parentdc7e77989134fcda94934dc96aa8ac1c735bd939 (diff)
downloadpython-ceilometerclient-c1141ed5be72ee169a7640b5d4957bfe02ad37ce.tar.gz
move old oslo-incubator code out of openstack/common
As part of the first community-wide goal, teams were asked to remove the openstack/common package of their projects if one existed. This was a byproduct of the old oslo-incubator form of syncing common functionality. The package, apiclient, was moved to a top level location and a new i18n module was created. There is no oslo.apiclient library or equivalent, the recommended solution is to move it in tree and maintain it there. Change-Id: Ia788313e0926dc872a87b090ef0a350898bfb079
Diffstat (limited to 'ceilometerclient/tests/unit/v2/test_shell.py')
-rw-r--r--ceilometerclient/tests/unit/v2/test_shell.py10
1 files changed, 5 insertions, 5 deletions
diff --git a/ceilometerclient/tests/unit/v2/test_shell.py b/ceilometerclient/tests/unit/v2/test_shell.py
index ce26af1..eca15e3 100644
--- a/ceilometerclient/tests/unit/v2/test_shell.py
+++ b/ceilometerclient/tests/unit/v2/test_shell.py
@@ -651,7 +651,7 @@ class ShellAlarmGnocchiCommandTest(test_shell.ShellTestBase):
def _test_alarm_gnocchi_resources_arguments(self, action, argv):
self.make_env(test_shell.FAKE_V2_ENV)
with mock.patch.object(alarms.AlarmManager, action) as mocked:
- with mock.patch('ceilometerclient.openstack.common.apiclient.'
+ with mock.patch('ceilometerclient.apiclient.'
'client.HTTPClient.client_request') as request:
request.site_effect = exceptions.EndpointNotFound
base_shell.main(argv)
@@ -673,7 +673,7 @@ class ShellAlarmGnocchiCommandTest(test_shell.ShellTestBase):
def _test_alarm_gnocchi_aggr_by_metrics_arguments(self, action, argv):
self.make_env(test_shell.FAKE_V2_ENV)
with mock.patch.object(alarms.AlarmManager, action) as mocked:
- with mock.patch('ceilometerclient.openstack.common.apiclient.'
+ with mock.patch('ceilometerclient.apiclient.'
'client.HTTPClient.client_request') as request:
request.site_effect = exceptions.EndpointNotFound
base_shell.main(argv)
@@ -695,7 +695,7 @@ class ShellAlarmGnocchiCommandTest(test_shell.ShellTestBase):
def _test_alarm_gnocchi_aggr_by_resources_arguments(self, action, argv):
self.make_env(test_shell.FAKE_V2_ENV)
with mock.patch.object(alarms.AlarmManager, action) as mocked:
- with mock.patch('ceilometerclient.openstack.common.apiclient.'
+ with mock.patch('ceilometerclient.apiclient.'
'client.HTTPClient.client_request') as request:
request.site_effect = exceptions.EndpointNotFound
base_shell.main(argv)
@@ -1633,7 +1633,7 @@ 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.openstack.common.apiclient.'
+ with mock.patch('ceilometerclient.apiclient.'
'client.HTTPClient.client_request') as request:
request.site_effect = exceptions.EndpointNotFound
base_shell.main(cli_args)
@@ -1724,7 +1724,7 @@ class ShellShadowedArgsTest(test_shell.ShellTestBase):
'--meter-unit', 'ns',
'--sample-volume', '10086',
]
- with mock.patch('ceilometerclient.openstack.common.apiclient.client.'
+ with mock.patch('ceilometerclient.apiclient.client.'
'HTTPClient.client_request') as client_request:
client_request.site_effect = exceptions.EndpointNotFound
base_shell.main(cli_args)