openstack
/
heat
Code Issues Proposed changes

Fixup ceilometerclient tests 

Closes-bug: #1533592
Change-Id: Ibdee5ac6311692434327d12fec36b46319611ab9
This commit is contained in:
Mehdi Abaakouk 2016-01-13 11:03:36 +01:00
parent f03483c582
commit 6d4c95adc5
2 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
heat/tests/clients/test_ceilometer_client.py
View File

@ -11,8 +11,7 @@
# License for the specific language governing permissions and limitations
# under the License.
from ceilometerclient import client as cc
from keystoneclient import exceptions
from ceilometerclient.openstack.common.apiclient import client as cc
from heat.tests import common
from heat.tests import utils
@ -21,8 +20,7 @@ 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)
self.patchobject(cc.HTTPClient, 'client_request')
context = utils.dummy_context()
plugin = context.clients.client_plugin('ceilometer')
client = plugin.client()

5
heat/tests/test_watch.py
View File

@ -624,9 +624,10 @@ class WatchRuleTest(common.HeatTestCase):
self.assertEqual(['DummyAction'], actions)
self.assertTrue(mock_get_resource.call_count > 0)
@mock.patch('ceilometerclient.client.AuthPlugin.redirect_to_aodh_endpoint')
@mock.patch('ceilometerclient.openstack.common.apiclient.'
'client.HTTPClient.client_request')
@mock.patch('heat.engine.stack.Stack.resource_by_refid')
def test_to_ceilometer(self, mock_get_resource, mock_redirect):
def test_to_ceilometer(self, mock_get_resource, mock_client_request):
# Setup
rule = {u'EvaluationPeriods': u'1',
u'AlarmDescription': u'test alarm',