[py]: Only SIGKILL service processes that did not gracefully clean up and exit from sigterm

Author: symonk

py/selenium/webdriver/common/service.py

@@ -167,9 +167,14 @@ def _terminate_process(self) -> None:
                 except AttributeError:
                     pass
             self.process.terminate()
-            self.process.wait(60)
-            # Todo: only SIGKILL if necessary; the process may be cleanly exited by now.
-            self.process.kill()
+            try:
+                self.process.wait(60)
+            except TimeoutError:
+                logger.error(
+                    "Service process refused to terminate gracefully with SIGTERM, escalating to SIGKILL.",
+                    exc_info=True,
+                )
+                self.process.kill()
         except OSError:
             logger.error("Error terminating service process.", exc_info=True)