From de099c733cee8614e66efd43d30565b4d0c1ccc6 Mon Sep 17 00:00:00 2001 From: Angus Salkeld Date: Tue, 11 Aug 2015 18:56:59 +1000 Subject: [PATCH] Mock out ceilometerclient redirect_to_aodh_endpoint Change-Id: If6280557694c5b651f4a20fef2de732ad1032fb5 Closes-bug: #1483488 --- heat/tests/clients/test_ceilometer_client.py | 5 +++++ heat/tests/test_watch.py | 4 ++++ 2 files changed, 9 insertions(+) diff --git a/heat/tests/clients/test_ceilometer_client.py b/heat/tests/clients/test_ceilometer_client.py index 5cb4e0f7c1..63777a3917 100644 --- a/heat/tests/clients/test_ceilometer_client.py +++ b/heat/tests/clients/test_ceilometer_client.py @@ -11,6 +11,9 @@ # License for the specific language governing permissions and limitations # under the License. +from ceilometerclient import client as cc +from keystoneclient import exceptions + from heat.tests import common from heat.tests import utils @@ -18,6 +21,8 @@ from heat.tests import utils class CeilometerClientPluginTests(common.HeatTestCase): def test_create(self): + self.patchobject(cc.AuthPlugin, 'redirect_to_aodh_endpoint', + side_effect=exceptions.EndpointNotFound) context = utils.dummy_context() plugin = context.clients.client_plugin('ceilometer') client = plugin.client() diff --git a/heat/tests/test_watch.py b/heat/tests/test_watch.py index 9ddf416a28..a1f0cc5c02 100644 --- a/heat/tests/test_watch.py +++ b/heat/tests/test_watch.py @@ -14,6 +14,8 @@ import datetime +from ceilometerclient import client as cc +from keystoneclient import exceptions import mox from oslo_utils import timeutils @@ -635,6 +637,8 @@ class WatchRuleTest(common.HeatTestCase): stack_id=self.stack_id, rule=rule) self.wr.store() + self.patchobject(cc.AuthPlugin, 'redirect_to_aodh_endpoint', + side_effect=exceptions.EndpointNotFound) self.m.StubOutWithMock(self.wr.context.clients.client('ceilometer'). samples, 'create', True)