More inclusive timeout error checking to account for different errors…

… during testing
scnerd · Nov 17, 2017 · 382bc5f · 382bc5f
1 parent 42f62fb
commit 382bc5f
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/miniutils/progress_bar.py b/miniutils/progress_bar.py
@@ -1,5 +1,6 @@
 import itertools
 import multiprocessing as mp
+from nose.plugins.multiprocess import TimedOutException
 import random
 import warnings
 
@@ -105,7 +106,7 @@ def _parallel_progbar_launch(mapper, iterable, nprocs=None, starmap=False, flatm
     for p in procs:
         try:
             p.join(1)
-        except TimeoutError:
+        except (TimeoutError, mp.TimeoutError, TimedOutException):
             warnings.warn("parallel_progbar mapping process failed to close properly (check error output)")