| commit | 421d25e866aaa16e1b2bb88601257dfc1f00e0c5 | [log] [tgz] |
|---|---|---|
| author | Jenkins <jenkins@review.openstack.org> | Thu Jul 09 15:58:22 2015 +0000 |
| committer | Gerrit Code Review <review@openstack.org> | Thu Jul 09 15:58:22 2015 +0000 |
| tree | 56396a7028aa9025d66b6f9365e4a2c1b56bcf2e | |
| parent | 3cfbd550aa1da8a9a2cc0e589dca6145eee53332 [diff] | |
| parent | b4aa0633c256e1fb66dded4a98ecd48cb13137a9 [diff] |
Merge "Re-enable the ceilometer alarm test"
diff --git a/scenario/test_ceilometer_alarm.py b/scenario/test_ceilometer_alarm.py index 1ad702b..d8f21fd 100644 --- a/scenario/test_ceilometer_alarm.py +++ b/scenario/test_ceilometer_alarm.py
@@ -36,7 +36,6 @@ def test_alarm(self): """Confirm we can create an alarm and trigger it.""" - self.skipTest('Until bug 1472891 is fixed in ceilometer') # 1. create the stack stack_identifier = self.stack_create(template=self.template)