← Back to branch summary

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

« back to all changes in this revision

Viewing changes to ceilometer/tests/alarm/evaluator/test_combination.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:
ceilometer/tests/alarm/evaluator/test_combination.py
24
24
from ceilometerclient import exc
25
25
from ceilometerclient.v2 import alarms
26
26
import mock
27
 
from oslo.utils import timeutils
 
27
from oslo_utils import timeutils
28
28
import pytz
29
29
 
30
30
from ceilometer.alarm.evaluator import combination
58
58
                                 '9cfc3e51-2ff1-4b1d-ac01-c1bd4c6d0d1e',
59
59
                                 '1d441595-d069-4e05-95ab-8693ba6a8302'],
60
60
                             operator='or',
61
 
                         )),
 
61
                         ),
 
62
                         severity='critical'),
62
63
            models.Alarm(name='and-alarm',
63
64
                         description='the and alarm',
64
65
                         type='combination',
79
80
                                 'b82734f4-9d06-48f3-8a86-fa59a0c99dc8',
80
81
                                 '15a700e5-2fe8-4b3d-8c55-9e92831f6a2b'],
81
82
                             operator='and',
82
 
                         ))
 
83
                         ),
 
84
                         severity='critical')
83
85
        ]
84
86
 
85
87
    @staticmethod