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

« back to all changes in this revision

Viewing changes to ceilometer/tests/agent/test_plugin.py

  • Committer: Package Import Robot
  • Author(s): James Page, Corey Bryant, James Page
  • Date: 2015-02-19 14:59:07 UTC
  • mfrom: (1.2.3)
  • Revision ID: package-import@ubuntu.com-20150219145907-9jojybdsl64zcn14
Tags: 2015.1~b2-0ubuntu1
[ Corey Bryant ]
* New upstream release.
  - d/control: Align requirements with upstream.
  - d/p/skip-test.patch: Rebased.

[ James Page ]
* d/rules,d/p/skip-gabbi.patch: Skip tests that rely on python-gabbi until
  packaging and MIR is complete.

Show diffs side-by-side

added added

removed removed

Lines of Context:
1
1
#
2
2
# Copyright 2013 eNovance <licensing@enovance.com>
3
3
#
4
 
# Author: Julien Danjou <julien@danjou.info>
5
 
#
6
4
# Licensed under the Apache License, Version 2.0 (the "License"); you may
7
5
# not use this file except in compliance with the License. You may obtain
8
6
# a copy of the License at
16
14
# under the License.
17
15
 
18
16
import mock
19
 
from oslo.config import fixture as fixture_config
 
17
from oslo_config import fixture as fixture_config
20
18
from oslotest import base
21
19
 
22
20
from ceilometer.agent import plugin_base
96
94
            'compute.instance.start', ['compute.*.*.foobar', 'compute.*']))
97
95
 
98
96
    class FakePlugin(plugin_base.NotificationBase):
99
 
        def get_exchange_topics(self, conf):
 
97
        @staticmethod
 
98
        def get_exchange_topics(conf):
100
99
            return [plugin_base.ExchangeTopics(exchange="exchange1",
101
100
                                               topics=["t1", "t2"]),
102
101
                    plugin_base.ExchangeTopics(exchange="exchange2",