From d925166a2512043e51b0aa41ad244a43b5b8fe54 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vincent=20Fran=C3=A7oise?= Date: Thu, 26 Jan 2017 10:42:30 +0100 Subject: [PATCH] Fix invalid mock on ceilometerclient The mocks on _get_alarm_client() are now failing because it was renamed as _get_redirect_client(). This fix reflects this name change. Change-Id: Id61e74dc4adc0c939661462953b322d65104a651 --- watcher/tests/common/test_clients.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/watcher/tests/common/test_clients.py b/watcher/tests/common/test_clients.py index d54aa669f..87b00ad03 100644 --- a/watcher/tests/common/test_clients.py +++ b/watcher/tests/common/test_clients.py @@ -194,11 +194,11 @@ class TestClients(base.TestCase): session=mock_session) @mock.patch.object(clients.OpenStackClients, 'session') - @mock.patch.object(ceclient_v2.Client, '_get_alarm_client') - def test_clients_ceilometer_diff_vers(self, mock_get_alarm_client, + @mock.patch.object(ceclient_v2.Client, '_get_redirect_client') + def test_clients_ceilometer_diff_vers(self, mock_get_redirect_client, mock_session): '''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', group='ceilometer_client') osc = clients.OpenStackClients() @@ -208,10 +208,10 @@ class TestClients(base.TestCase): type(osc.ceilometer())) @mock.patch.object(clients.OpenStackClients, 'session') - @mock.patch.object(ceclient_v2.Client, '_get_alarm_client') - def test_clients_ceilometer_cached(self, mock_get_alarm_client, + @mock.patch.object(ceclient_v2.Client, '_get_redirect_client') + def test_clients_ceilometer_cached(self, mock_get_redirect_client, 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._ceilometer = None ceilometer = osc.ceilometer()