openstack/oslo.messaging
Code Issues Proposed changes

Merge "Add restart() method to DecayingTimer"

Browse Source
This commit is contained in:
Zuul 2018-04-04 00:12:43 +00:00 committed by Gerrit Code Review
commit b0776c515d
2 changed files with 17 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oslo_messaging/_drivers/common.py
View File

@ -347,6 +347,9 @@ class DecayingTimer(object):
def start(self): def start(self):
self._watch.start() self._watch.start()
def restart(self):
self._watch.restart()
def check_return(self, timeout_callback=None, *args, **kwargs): def check_return(self, timeout_callback=None, *args, **kwargs):
maximum = kwargs.pop('maximum', None) maximum = kwargs.pop('maximum', None)
left = self._watch.leftover(return_none=True) left = self._watch.leftover(return_none=True)

14
oslo_messaging/tests/test_utils.py
View File

@ -97,3 +97,17 @@ class TimerTestCase(test_utils.BaseTestCase):
remaining = t.check_return(callback, 1, a='b') remaining = t.check_return(callback, 1, a='b')
self.assertEqual(0, remaining) self.assertEqual(0, remaining)
callback.assert_called_once_with(1, a='b') callback.assert_called_once_with(1, a='b')
@mock.patch('oslo_utils.timeutils.now')
def test_reset(self, now):
now.return_value = 0
t = common.DecayingTimer(3)
t.start()
now.return_value = 1
remaining = t.check_return()
self.assertEqual(2, remaining)
t.restart()
remaining = t.check_return()
self.assertEqual(3, remaining)