diff options
| author | Zane Bitter <zbitter@redhat.com> | 2018-12-06 16:36:08 +1300 |
|---|---|---|
| committer | Zane Bitter <zbitter@redhat.com> | 2018-12-07 09:24:56 +1300 |
| commit | de09e60407786499de4569b13e3cf4cedfd23866 (patch) | |
| tree | cb9049e58240fa6542abf4abefae5f5880ce5260 | |
| parent | 0b83b051158f28160a8e3e73bc39c5304a60182f (diff) | |
| download | heat-de09e60407786499de4569b13e3cf4cedfd23866.tar.gz | |
Use ThreadGroup.add_timer() API correctly
In practice we never pass any arguments to the callback function, but if
we did we'd be doing it wrong. Multiple projects appear to have copied
this code from us (directly or indirectly). Fix it before we lead anyone
else astray.
Change-Id: If9cddc470158f32587b2aac19e92d1e01b48bc50
| -rw-r--r-- | heat/engine/service.py | 2 | ||||
| -rw-r--r-- | heat/tests/engine/service/test_threadgroup_mgr.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/heat/engine/service.py b/heat/engine/service.py index 38ee7291b..d761577b5 100644 --- a/heat/engine/service.py +++ b/heat/engine/service.py @@ -219,7 +219,7 @@ class ThreadGroupManager(object): if stack_id not in self.groups: self.groups[stack_id] = threadgroup.ThreadGroup() self.groups[stack_id].add_timer(cfg.CONF.periodic_interval, - func, *args, **kwargs) + func, None, *args, **kwargs) def add_msg_queue(self, stack_id, msg_queue): self.msg_queues[stack_id].append(msg_queue) diff --git a/heat/tests/engine/service/test_threadgroup_mgr.py b/heat/tests/engine/service/test_threadgroup_mgr.py index f53880fbe..b66e96170 100644 --- a/heat/tests/engine/service/test_threadgroup_mgr.py +++ b/heat/tests/engine/service/test_threadgroup_mgr.py @@ -76,7 +76,7 @@ class ThreadGroupManagerTest(common.HeatTestCase): self.assertEqual(self.tg_mock, thm.groups[stack_id]) self.tg_mock.add_timer.assert_called_with( self.cfg_mock.CONF.periodic_interval, - self.f, *self.fargs, **self.fkwargs) + self.f, None, *self.fargs, **self.fkwargs) def test_tgm_add_msg_queue(self): stack_id = 'add_msg_queues_test' |