Merge "Add missing extra "greenthread" arg to remove_event()"
This commit is contained in:
commit
12d5bf8373
@ -179,7 +179,7 @@ class ThreadGroupManager(object):
|
|||||||
def add_event(self, stack_id, event):
|
def add_event(self, stack_id, event):
|
||||||
self.events[stack_id].append(event)
|
self.events[stack_id].append(event)
|
||||||
|
|
||||||
def remove_event(self, stack_id, event):
|
def remove_event(self, gt, stack_id, event):
|
||||||
for e in self.events.pop(stack_id, []):
|
for e in self.events.pop(stack_id, []):
|
||||||
if e is not event:
|
if e is not event:
|
||||||
self.add_event(stack_id, e)
|
self.add_event(stack_id, e)
|
||||||
|
@ -3506,9 +3506,9 @@ class ThreadGroupManagerTest(HeatTestCase):
|
|||||||
thm = service.ThreadGroupManager()
|
thm = service.ThreadGroupManager()
|
||||||
thm.add_event(stack_id, e1)
|
thm.add_event(stack_id, e1)
|
||||||
thm.add_event(stack_id, e2)
|
thm.add_event(stack_id, e2)
|
||||||
thm.remove_event(stack_id, e2)
|
thm.remove_event(None, stack_id, e2)
|
||||||
self.assertEqual(thm.events[stack_id], [e1])
|
self.assertEqual(thm.events[stack_id], [e1])
|
||||||
thm.remove_event(stack_id, e1)
|
thm.remove_event(None, stack_id, e1)
|
||||||
self.assertNotIn(stack_id, thm.events)
|
self.assertNotIn(stack_id, thm.events)
|
||||||
|
|
||||||
def test_tgm_send(self):
|
def test_tgm_send(self):
|
||||||
|
Loading…
Reference in New Issue
Block a user