← Back to branch summary

~ubuntu-branches/ubuntu/utopic/ceilometer/utopic

« back to all changes in this revision

Viewing changes to ceilometer/tests/api/v2/test_list_resources_scenarios.py

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2014-10-16 14:07:11 UTC
  • mfrom: (1.2.1) (28.1.5 utopic-proposed)
  • Revision ID: package-import@ubuntu.com-20141016140711-95mki6bdkivvfr2x
Tags: 2014.2-0ubuntu1
New upstream release. 

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer/tests/api/v2/test_list_resources_scenarios.py
19
19
 
20
20
import datetime
21
21
import json
22
 
import logging
23
22
 
 
23
from oslo.utils import timeutils
24
24
import six
25
25
 
26
 
from ceilometer.openstack.common import timeutils
27
26
from ceilometer.publisher import utils
28
27
from ceilometer import sample
29
 
from ceilometer.tests.api.v2 import FunctionalTest
 
28
from ceilometer.tests.api import v2
30
29
from ceilometer.tests import db as tests_db
31
30
 
32
 
LOG = logging.getLogger(__name__)
33
 
 
34
 
 
35
 
class TestListResources(FunctionalTest,
 
31
 
 
32
class TestListResources(v2.FunctionalTest,
36
33
                        tests_db.MixinTestsWithBackendScenarios):
37
34
 
38
35
    def test_empty(self):
479
476
                          (u'display_name', u'test-server'),
480
477
                          (u'not_ignored_list', u"['returned']"),
481
478
                          (u'tag', u'self.sample')],
482
 
                         list(sorted(metadata.iteritems())))
 
479
                         list(sorted(six.iteritems(metadata))))
483
480
 
484
481
    def test_resource_meter_links(self):
485
482
        sample1 = sample.Sample(