[py] ensure all drivers stop service during driver quit

Author: titusfortner

py/selenium/webdriver/chromium/webdriver.py

@@ -44,28 +44,25 @@ def __init__(
          - service - Service object for handling the browser driver if you need to pass extra details
          - keep_alive - Whether to configure ChromiumRemoteConnection to use HTTP keep-alive.
         """
-        self.vendor_prefix = vendor_prefix
-
         self.service = service
 
         self.service.path = DriverFinder.get_path(self.service, options)
-
         self.service.start()
 
+        executor = ChromiumRemoteConnection(
+            remote_server_addr=self.service.service_url,
+            browser_name=browser_name,
+            vendor_prefix=vendor_prefix,
+            keep_alive=keep_alive,
+            ignore_proxy=options._ignore_local_proxy,
+        )
+
         try:
-            super().__init__(
-                command_executor=ChromiumRemoteConnection(
-                    remote_server_addr=self.service.service_url,
-                    browser_name=browser_name,
-                    vendor_prefix=vendor_prefix,
-                    keep_alive=keep_alive,
-                    ignore_proxy=options._ignore_local_proxy,
-                ),
-                options=options,
-            )
+            super().__init__(command_executor=executor, options=options)
         except Exception:
             self.quit()
             raise
+
         self._is_remote = False
 
     def launch_app(self, id):
@@ -181,8 +178,7 @@ def stop_casting(self, sink_name: str) -> dict:
         return self.execute("stopCasting", {"sinkName": sink_name})
 
     def quit(self) -> None:
-        """Closes the browser and shuts down the ChromiumDriver executable that
-        is started when starting the ChromiumDriver."""
+        """Closes the browser and shuts down the ChromiumDriver executable."""
         try:
             super().quit()
         except Exception:

py/selenium/webdriver/firefox/webdriver.py

@@ -61,22 +61,27 @@ def __init__(
 
         executor = FirefoxRemoteConnection(
             remote_server_addr=self.service.service_url,
-            ignore_proxy=options._ignore_local_proxy,
             keep_alive=keep_alive,
+            ignore_proxy=options._ignore_local_proxy,
         )
-        super().__init__(command_executor=executor, options=options)
+
+        try:
+            super().__init__(command_executor=executor, options=options)
+        except Exception:
+            self.quit()
+            raise
 
         self._is_remote = False
 
     def quit(self) -> None:
-        """Quits the driver and close every associated window."""
+        """Closes the browser and shuts down the GeckoDriver executable."""
         try:
             super().quit()
         except Exception:
             # We don't care about the message because something probably has gone wrong
             pass
-
-        self.service.stop()
+        finally:
+            self.service.stop()
 
     def set_context(self, context) -> None:
         self.execute("SET_CONTEXT", {"context": context})

py/selenium/webdriver/ie/webdriver.py

@@ -55,9 +55,20 @@ def __init__(
             ignore_proxy=options._ignore_local_proxy,
         )
 
-        super().__init__(command_executor=executor, options=options)
+        try:
+            super().__init__(command_executor=executor, options=options)
+        except Exception:
+            self.quit()
+            raise
+
         self._is_remote = False
 
     def quit(self) -> None:
-        super().quit()
-        self.service.stop()
+        """Closes the browser and shuts down the IEServerDriver executable."""
+        try:
+            super().quit()
+        except Exception:
+            # We don't care about the message because something probably has gone wrong
+            pass
+        finally:
+            self.service.stop()

py/selenium/webdriver/safari/webdriver.py

@@ -15,8 +15,6 @@
 # specific language governing permissions and limitations
 # under the License.
 
-import http.client as http_client
-
 from selenium.common.exceptions import WebDriverException
 from selenium.webdriver.remote.webdriver import WebDriver as RemoteWebDriver
 
@@ -58,16 +56,20 @@ def __init__(
             ignore_proxy=options._ignore_local_proxy,
         )
 
-        super().__init__(command_executor=executor, options=options)
+        try:
+            super().__init__(command_executor=executor, options=options)
+        except Exception:
+            self.quit()
+            raise
 
         self._is_remote = False
 
     def quit(self):
-        """Closes the browser and shuts down the SafariDriver executable that
-        is started when starting the SafariDriver."""
+        """Closes the browser and shuts down the SafariDriver executable."""
         try:
             super().quit()
-        except http_client.BadStatusLine:
+        except Exception:
+            # We don't care about the message because something probably has gone wrong
             pass
         finally:
             if not self.service.reuse_service: