openstack/ceilometer
Code Issues Proposed changes

Fix config setting references in API tests

Browse Source 
These tests are being skipped in the CI system because
we aren't installing Ming. I'm working on a separate
patch to restore Ming to the dependency list for tests,
and while preparing for that I found that these tests
break when Ming is installed.

Change-Id: I4604bbde0c92109b4e2a88f1492793d75c5c0e4d
Signed-off-by: Doug Hellmann <doug.hellmann@dreamhost.com>
This commit is contained in:
Doug Hellmann 2013-05-14 11:06:26 -04:00
parent 07828e3bca
commit 436b4baba9
2 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
tests/api/v2/test_acl.py
View File

@ -98,9 +98,10 @@ class TestAPIACL(FunctionalTest):
timestamp=datetime.datetime(2012, 7, 2, 10, 43),
resource_metadata={'display_name': 'test-server',
'tag': 'self.counter4'})]:
msg = meter.meter_message_from_counter(cnt,
cfg.CONF.metering_secret,
'test_source')
msg = meter.meter_message_from_counter(
cnt,
cfg.CONF.publisher_meter.metering_secret,
'test_source')
self.conn.record_metering_data(msg)
def get_json(self, path, expect_errors=False, headers=None,

18
tests/api/v2/test_list_resources.py
View File

@ -304,10 +304,11 @@ class TestListResources(FunctionalTest):
'tag': 'self.counter1',
}
)
msg2 = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret,
'not-test',
)
msg2 = meter.meter_message_from_counter(
counter1,
cfg.CONF.publisher_meter.metering_secret,
'not-test',
)
self.conn.record_metering_data(msg2)
data = self.get_json('/resources',
@ -330,10 +331,11 @@ class TestListResources(FunctionalTest):
'tag': 'self.counter1',
}
)
msg2 = meter.meter_message_from_counter(counter1,
cfg.CONF.metering_secret,
'not-test',
)
msg2 = meter.meter_message_from_counter(
counter1,
cfg.CONF.publisher_meter.metering_secret,
'not-test',
)
self.conn.record_metering_data(msg2)
data = self.get_json('/resources',