Merge "Remove some thread join timeouts"

This commit is contained in:
Zuul 2019-03-24 20:23:12 +00:00 committed by Gerrit Code Review
commit 6805f8725c
2 changed files with 2 additions and 6 deletions

View File

@ -192,9 +192,7 @@ class GithubGearmanWorker(object):
def stop(self):
self._running = False
self.gearman.stopWaitingForJobs()
# We join here to avoid whitelisting the thread -- if it takes more
# than 5s to stop in tests, there's a problem.
self.thread.join(timeout=5)
self.thread.join()
self.gearman.shutdown()

View File

@ -161,9 +161,7 @@ class DiskAccountant(object):
return
self._running = False
self.stop_event.set()
# We join here to avoid whitelisting the thread -- if it takes more
# than 5s to stop in tests, there's a problem.
self.thread.join(timeout=5)
self.thread.join()
@property
def running(self):