openstack
/
oslo.utils
Code Issues Proposed changes

Merge "Avoid calling eventlet.event.Event.reset()"

This commit is contained in:
Zuul 2019-01-18 03:31:53 +00:00 committed by Gerrit Code Review
parent 380bf5a47e 14a53c4d8a
commit eff0629790
2 changed files with 6 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
oslo_utils/eventletutils.py
View File

@ -165,11 +165,9 @@ class EventletEvent(object):
isSet = is_set isSet = is_set
def set(self): def set(self):
if self._set: if not self._set:
self._event.reset() self._set = True
self._event.send(True)
self._set = True
self._event.send(True)
def wait(self, timeout=None): def wait(self, timeout=None):
with timeutils.StopWatch(timeout) as sw: with timeutils.StopWatch(timeout) as sw:

7
oslo_utils/tests/test_eventletutils.py
View File

@ -146,12 +146,11 @@ class EventletUtilsTest(test_base.BaseTestCase):
self.assertTrue(hasattr(e_event, method)) self.assertTrue(hasattr(e_event, method))
# Ensure set() allows multiple invocations, same as in # Ensure set() allows multiple invocations, same as in
# threading implementation. Must call reset on underlying # threading implementation.
# Event before reusing it
e_event.set() e_event.set()
self.assertEqual(0, mock_eventlet.event.Event().reset.call_count) self.assertTrue(e_event.isSet())
e_event.set() e_event.set()
self.assertEqual(1, mock_eventlet.event.Event().reset.call_count) self.assertTrue(e_event.isSet())
def test_event_no_timeout(self): def test_event_no_timeout(self):
event = eventletutils.EventletEvent() event = eventletutils.EventletEvent()