openstack/aodh
Code Issues Proposed changes

Merge "Avoid conflict with existing gnocchi_url conf value"

Browse Source
This commit is contained in:
Jenkins 2015-04-09 08:43:05 +00:00 committed by Gerrit Code Review
commit 21216a297d
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
ceilometer/tests/api/v2/test_alarm_scenarios.py
View File

@ -23,6 +23,7 @@ from oslo_serialization import jsonutils
import requests import requests
import six import six
from six import moves from six import moves
import six.moves.urllib.parse as urlparse
from ceilometer.alarm.storage import models from ceilometer.alarm.storage import models
from ceilometer import messaging from ceilometer import messaging
@ -2484,10 +2485,17 @@ class TestAlarms(v2.FunctionalTest,
) as gnocchi_get: ) as gnocchi_get:
self.post_json('/alarms', params=json, headers=self.auth_headers) self.post_json('/alarms', params=json, headers=self.auth_headers)
expected = [mock.call('http://localhost:8041/v1/capabilities', gnocchi_url = self.CONF.alarms.gnocchi_url
capabilities_url = urlparse.urljoin(gnocchi_url,
'/v1/capabilities')
resource_url = urlparse.urljoin(
gnocchi_url,
'/v1/resource/instance/209ef69c-c10c-4efb-90ff-46f4b2d90d2e'
)
expected = [mock.call(capabilities_url,
headers=mock.ANY), headers=mock.ANY),
mock.call('http://localhost:8041/v1/resource/instance/' mock.call(resource_url,
'209ef69c-c10c-4efb-90ff-46f4b2d90d2e',
headers=mock.ANY)] headers=mock.ANY)]
self.assertEqual(expected, gnocchi_get.mock_calls) self.assertEqual(expected, gnocchi_get.mock_calls)