Arnike/watcher
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix invalid mock on ceilometerclient"

Browse Source
This commit is contained in:
Jenkins
2017-01-26 13:54:48 +00:00
committed by Gerrit Code Review
parent 4a5d8cf709 d925166a25
commit b4433db20a
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
watcher/tests/common/test_clients.py
View File

@@ -194,11 +194,11 @@ class TestClients(base.TestCase):
session=mock_session) session=mock_session)
@mock.patch.object(clients.OpenStackClients, 'session') @mock.patch.object(clients.OpenStackClients, 'session')
@mock.patch.object(ceclient_v2.Client, '_get_alarm_client') @mock.patch.object(ceclient_v2.Client, '_get_redirect_client')
def test_clients_ceilometer_diff_vers(self, mock_get_alarm_client, def test_clients_ceilometer_diff_vers(self, mock_get_redirect_client,
mock_session): mock_session):
'''ceilometerclient currently only has one version (v2)''' '''ceilometerclient currently only has one version (v2)'''
mock_get_alarm_client.return_value = [mock.Mock(), mock.Mock()] mock_get_redirect_client.return_value = [mock.Mock(), mock.Mock()]
CONF.set_override('api_version', '2', CONF.set_override('api_version', '2',
group='ceilometer_client') group='ceilometer_client')
osc = clients.OpenStackClients() osc = clients.OpenStackClients()
@@ -208,10 +208,10 @@ class TestClients(base.TestCase):
type(osc.ceilometer())) type(osc.ceilometer()))
@mock.patch.object(clients.OpenStackClients, 'session') @mock.patch.object(clients.OpenStackClients, 'session')
@mock.patch.object(ceclient_v2.Client, '_get_alarm_client') @mock.patch.object(ceclient_v2.Client, '_get_redirect_client')
def test_clients_ceilometer_cached(self, mock_get_alarm_client, def test_clients_ceilometer_cached(self, mock_get_redirect_client,
mock_session): mock_session):
mock_get_alarm_client.return_value = [mock.Mock(), mock.Mock()] mock_get_redirect_client.return_value = [mock.Mock(), mock.Mock()]
osc = clients.OpenStackClients() osc = clients.OpenStackClients()
osc._ceilometer = None osc._ceilometer = None
ceilometer = osc.ceilometer() ceilometer = osc.ceilometer()