Merge "Ensure we 'join' on the timer watchdog thread"

This commit is contained in:
Jenkins 2015-06-24 17:17:20 +00:00 committed by Gerrit Code Review
commit 5f5bc73049

View File

@ -67,3 +67,4 @@ def watch(logger, action, level=logging.DEBUG, after=5.0):
yield
finally:
timer.cancel()
timer.join()