← Back to branch summary

~ubuntu-branches/ubuntu/vivid/ceilometer/vivid

« back to all changes in this revision

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

  • Committer: Package Import Robot
  • Author(s): Chuck Short
  • Date: 2015-04-15 13:51:39 UTC
  • mfrom: (1.2.5)
  • Revision ID: package-import@ubuntu.com-20150415135139-wu1mlm9g91iibcu5
Tags: 2015.1~rc1-0ubuntu1
* New upstream milestone release:
  - d/control: Align with upstream dependencies.
  - d/p/disable-kafka.patch: Refreshed.

Show diffs side-by-side

added added

removed removed

Lines of Context:
ceilometer/tests/api/v2/test_query.py
367
367
        exc = self.assertRaises(
368
368
            wsme.exc.UnknownArgument,
369
369
            utils.query_to_kwargs, q, storage.SampleFilter.__init__)
370
 
        valid_keys = ['message_id', 'metaquery', 'meter', 'project',
371
 
                      'resource', 'search_offset', 'source', 'timestamp',
372
 
                      'user']
 
370
        valid_keys = ['message_id', 'meter', 'project', 'resource',
 
371
                      'search_offset', 'source', 'timestamp', 'user']
373
372
        msg = ("unrecognized field in query: %s, "
374
373
               "valid keys: %s") % (q, valid_keys)
375
374
        expected_exc = wsme.exc.UnknownArgument('abc', msg)
382
381
        exc = self.assertRaises(
383
382
            wsme.exc.UnknownArgument,
384
383
            utils.query_to_kwargs, q, storage_base.Connection.get_meters)
385
 
        valid_keys = ['metaquery', 'pagination', 'project', 'resource',
386
 
                      'source', 'user']
 
384
        valid_keys = ['pagination', 'project', 'resource', 'source', 'user']
387
385
        msg = ("unrecognized field in query: %s, "
388
386
               "valid keys: %s") % (q, valid_keys)
389
387
        expected_exc = wsme.exc.UnknownArgument('abc', msg)
396
394
        exc = self.assertRaises(
397
395
            wsme.exc.UnknownArgument,
398
396
            utils.query_to_kwargs, q, storage_base.Connection.get_resources)
399
 
        valid_keys = ['metaquery', 'pagination', 'project', 'resource',
 
397
        valid_keys = ['pagination', 'project', 'resource',
400
398
                      'search_offset', 'source', 'timestamp', 'user']
401
399
        msg = ("unrecognized field in query: %s, "
402
400
               "valid keys: %s") % (q, valid_keys)