openstack/aodh
Code Issues Proposed changes

Merge "fix inline multiple assignment"

Browse Source
This commit is contained in:
Jenkins 2015-02-25 17:46:15 +00:00 committed by Gerrit Code Review
commit 613c357cb8
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ceilometer/notification.py
View File

@ -82,7 +82,7 @@ class NotificationService(os_service.Service):
def __init__(self, *args, **kwargs): def __init__(self, *args, **kwargs):
super(NotificationService, self).__init__(*args, **kwargs) super(NotificationService, self).__init__(*args, **kwargs)
self.partition_coordinator = None self.partition_coordinator = None
self.listeners = self.pipeline_listeners = [] self.listeners, self.pipeline_listeners = [], []
self.group_id = None self.group_id = None
@classmethod @classmethod
@ -136,7 +136,7 @@ class NotificationService(os_service.Service):
event_transporter = self.event_pipeline_manager event_transporter = self.event_pipeline_manager
self.group_id = None self.group_id = None
self.listeners = self.pipeline_listeners = [] self.listeners, self.pipeline_listeners = [], []
self._configure_main_queue_listeners(transporter, event_transporter) self._configure_main_queue_listeners(transporter, event_transporter)
if cfg.CONF.notification.workload_partitioning: if cfg.CONF.notification.workload_partitioning:

3
ceilometer/tests/api/v2/test_event_scenarios.py
View File

@ -35,7 +35,8 @@ class EventTestBase(v2.FunctionalTest,
def _generate_models(self): def _generate_models(self):
event_models = [] event_models = []
base = 0 base = 0
self.s_time = self.trait_time = datetime.datetime(2013, 12, 31, 5, 0) self.s_time = datetime.datetime(2013, 12, 31, 5, 0)
self.trait_time = datetime.datetime(2013, 12, 31, 5, 0)
for event_type in ['Foo', 'Bar', 'Zoo']: for event_type in ['Foo', 'Bar', 'Zoo']:
trait_models = [models.Trait(name, type, value) trait_models = [models.Trait(name, type, value)
for name, type, value in [ for name, type, value in [

2
ceilometer/tests/test_notification.py
View File

@ -225,7 +225,7 @@ class BaseRealNotification(tests_base.BaseTestCase):
len(self.publisher.events) >= self.expected_events): len(self.publisher.events) >= self.expected_events):
break break
eventlet.sleep(0) eventlet.sleep(0)
self.assertNotEqual(self.srv.listeners, self.srv.pipeline_listeners)
self.srv.stop() self.srv.stop()
resources = list(set(s.resource_id for s in self.publisher.samples)) resources = list(set(s.resource_id for s in self.publisher.samples))