Making safe_get safer

Author: Hartorn

giskard/utils/worker_pool.py

@@ -189,7 +189,7 @@ def safe_get(self, queue: Queue, timeout: float = 1) -> Tuple[Any, bool]:
             result = queue.get(timeout=timeout)
         except Empty:
             result = None
-        except ValueError as e:
+        except (ValueError, OSError) as e:
             # If queue is closed
             if not self.terminated():
                 LOGGER.error("Queue is closed, and executor not in final state")
@@ -314,7 +314,7 @@ def shutdown(self, wait=True, *, cancel_futures=True, timeout: float = 5, force=
         if not force:
             self._state = PoolState.STOPPED
         # Cleaning up processes
-        exit_codes = _stop_processes(p_list, timeout=1)
+        exit_codes = _stop_processes(p_list, timeout=timeout)
         self._manager.shutdown()
         return exit_codes
 
@@ -387,6 +387,3 @@ def _killer_thread(
 
         if exception is not None:
             raise exception
-
-        if executor.terminated():
-            return

tests/test_worker_pool.py

@@ -16,17 +16,15 @@ def many_worker_pool():
     pool = WorkerPoolExecutor(nb_workers=4)
     sleep(3)
     yield pool
-    pool.shutdown(wait=True)
-    pool.shutdown(wait=False, force=True)
+    pool.shutdown(wait=True, force=True, timeout=10)
 
 
 @pytest.fixture(scope="function")
 def one_worker_pool():
     pool = WorkerPoolExecutor(nb_workers=1)
     sleep(3)
     yield pool
-    pool.shutdown(wait=True)
-    pool.shutdown(wait=False, force=True)
+    pool.shutdown(wait=True, force=True, timeout=10)
 
 
 @pytest.mark.concurrency