Merge "Remove some thread join timeouts"
This commit is contained in:
commit
6805f8725c
|
@ -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()
|
||||
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
Loading…
Reference in New Issue