openstack
/
ceilometer
Code Issues Proposed changes

Correct class when stopping partitioned alarm eval svc 

Avoid traceback on service shutdown by fixing tiny copy'n'paste
error in oslo-messaging switchover.

Change-Id: I5cf7e6f46ab1d982c59f8730eea1b8e7a3bd75e9
Closes-bug: #1317184
This commit is contained in:
Eoghan Glynn 2014-05-07 17:40:06 +01:00
parent dbeb6260d3
commit d35790f358
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ceilometer/alarm/service.py
View File

@ -170,7 +170,7 @@ class PartitionedAlarmService(AlarmService, os_service.Service):
def stop(self):
self.rpc_server.stop()
super(AlarmNotifierService, self).stop()
super(PartitionedAlarmService, self).stop()
def _assigned_alarms(self):
return self.partition_coordinator.assigned_alarms(self._client)

3
ceilometer/tests/alarm/test_partitioned_alarm_svc.py
View File

@ -57,7 +57,7 @@ class TestPartitionedAlarmService(test.BaseTestCase):
self.partitioned.extension_manager = self.extension_mgr
@mock.patch('ceilometer.pipeline.setup_pipeline', mock.MagicMock())
def test_start(self):
def test_lifecycle(self):
test_interval = 120
self.CONF.set_override('evaluation_interval',
test_interval,
@ -84,6 +84,7 @@ class TestPartitionedAlarmService(test.BaseTestCase):
]
actual = self.partitioned.tg.add_timer.call_args_list
self.assertEqual(expected, actual)
self.partitioned.stop()
def test_presence_reporting(self):
priority = 42