[py] service: only shutdown if process not terminated (#15183)

* service: only shutdown if process not terminated

There are scenarios where a stop() is called on a Service object
multiple times. This also happens when explicitly quitting a Webdriver using
driver.quit() and afterwards having the garbage collector destroy the service
object, calling stop() another time even though the service process
has already terminated.

The check inside the stop() call only ensured that the process variable
is not None, but ignored the fact that the process might already have
terminated. Therefor an additional check is introduced to only send
the remote shutdown command if the service process has not ended.

Fixes #15182

Signed-off-by: Sandro Pischinger <[email protected]>

* service: move process termination to finally block

If a type error or similar occurs during send_remote_shutdown_command,
one should always terminate the service process, even if an exception
is thrown.
Thus moving self._terminate_process() into a finally block.

Signed-off-by: Sandro Pischinger <[email protected]>

---------

Signed-off-by: Sandro Pischinger <[email protected]>
Co-authored-by: Viet Nguyen Duc <[email protected]>
Co-authored-by: Corey Goldberg <[email protected]>
Co-authored-by: Simon Benzer <[email protected]>

Author: 4 people

py/selenium/webdriver/common/service.py

@@ -152,12 +152,13 @@ def stop(self) -> None:
             elif isinstance(self.log_output, int):
                 os.close(self.log_output)
 
-        if self.process is not None:
+        if self.process is not None and self.process.poll() is None:
             try:
                 self.send_remote_shutdown_command()
             except TypeError:
                 pass
-            self._terminate_process()
+            finally:
+                self._terminate_process()
 
     def _terminate_process(self) -> None:
         """Terminate the child process.