c58320a4ea
In Python 3.3, hash randomization is enabled by default. It causes the iteration order of dicts and sets to be unpredictable and differ across Python runs. In the test case, the fixed expecting string will not match the test result, it is relying on the dict order. This change transforms the input dict to a sequence of two-element list, with fixed order, and update the related expecitng string / fixture in test cases. Partial Implement: blueprint py33-support Change-Id: I6dccde9e584be8335a6375f5fbad5c5cbd7b9b6d
106 lines
3.4 KiB
Python
106 lines
3.4 KiB
Python
# Copyright 2012 OpenStack Foundation
|
|
# All Rights Reserved.
|
|
#
|
|
# Licensed under the Apache License, Version 2.0 (the "License"); you may
|
|
# not use this file except in compliance with the License. You may obtain
|
|
# a copy of the License at
|
|
#
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
#
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
|
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
|
# License for the specific language governing permissions and limitations
|
|
# under the License.
|
|
|
|
from ceilometerclient.tests import utils
|
|
import ceilometerclient.v2.statistics
|
|
|
|
base_url = '/v2/meters/instance/statistics'
|
|
qry = 'q.field=resource_id&q.field=source&q.op=&q.op=&q.value=foo&q.value=bar'
|
|
period = '&period=60'
|
|
samples = [{
|
|
u'count': 135,
|
|
u'duration_start': u'2013-02-04T10:51:42',
|
|
u'min': 1.0,
|
|
u'max': 1.0,
|
|
u'duration_end':
|
|
u'2013-02-05T15:46:09',
|
|
u'duration': 1734.0,
|
|
u'avg': 1.0,
|
|
u'sum': 135.0,
|
|
}]
|
|
fixtures = {
|
|
base_url:
|
|
{
|
|
'GET': (
|
|
{},
|
|
samples
|
|
),
|
|
},
|
|
'%s?%s' % (base_url, qry):
|
|
{
|
|
'GET': (
|
|
{},
|
|
samples
|
|
),
|
|
},
|
|
'%s?%s%s' % (base_url, qry, period):
|
|
{
|
|
'GET': (
|
|
{},
|
|
samples
|
|
),
|
|
},
|
|
}
|
|
|
|
|
|
class StatisticsManagerTest(utils.BaseTestCase):
|
|
|
|
def setUp(self):
|
|
super(StatisticsManagerTest, self).setUp()
|
|
self.api = utils.FakeAPI(fixtures)
|
|
self.mgr = ceilometerclient.v2.statistics.StatisticsManager(self.api)
|
|
|
|
def test_list_by_meter_name(self):
|
|
stats = list(self.mgr.list(meter_name='instance'))
|
|
expect = [
|
|
('GET', '/v2/meters/instance/statistics', {}, None),
|
|
]
|
|
self.assertEqual(self.api.calls, expect)
|
|
self.assertEqual(len(stats), 1)
|
|
self.assertEqual(stats[0].count, 135)
|
|
|
|
def test_list_by_meter_name_extended(self):
|
|
stats = list(self.mgr.list(meter_name='instance',
|
|
q=[
|
|
{"field": "resource_id",
|
|
"value": "foo"},
|
|
{"field": "source",
|
|
"value": "bar"},
|
|
]))
|
|
expect = [
|
|
('GET',
|
|
'%s?%s' % (base_url, qry), {}, None),
|
|
]
|
|
self.assertEqual(self.api.calls, expect)
|
|
self.assertEqual(len(stats), 1)
|
|
self.assertEqual(stats[0].count, 135)
|
|
|
|
def test_list_by_meter_name_with_period(self):
|
|
stats = list(self.mgr.list(meter_name='instance',
|
|
q=[
|
|
{"field": "resource_id",
|
|
"value": "foo"},
|
|
{"field": "source",
|
|
"value": "bar"},
|
|
],
|
|
period=60))
|
|
expect = [
|
|
('GET',
|
|
'%s?%s%s' % (base_url, qry, period), {}, None),
|
|
]
|
|
self.assertEqual(self.api.calls, expect)
|
|
self.assertEqual(len(stats), 1)
|
|
self.assertEqual(stats[0].count, 135)
|