openstack/deb-ceilometer
Code Issues Proposed changes

Merge "Correct test_list_meters_meter_id to work with py3"

Browse Source
This commit is contained in:
Jenkins 2015-09-10 23:48:59 +00:00 committed by Gerrit Code Review
commit 551402cd13
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/tests/functional/api/v2/test_list_meters_scenarios.py
View File

@ -791,5 +791,5 @@ class TestListMeters(v2.FunctionalTest,
self.assertEqual(expected, i['meter_id']) self.assertEqual(expected, i['meter_id'])
self.assertFalse(i['meter_id'].endswith('\n')) self.assertFalse(i['meter_id'].endswith('\n'))
self.assertEqual( self.assertEqual(
[i['resource_id'].encode('utf-8'), i['name'].encode('utf-8')], [i['resource_id'], i['name']],
base64.b64decode(i['meter_id']).split('+')) base64.b64decode(i['meter_id']).decode('utf-8').split('+'))