Merge branch 'trunk' into py-fix-test-environment-mocks

Author: cgoldberg

py/test/selenium/webdriver/edge/edge_service_tests.py

@@ -31,21 +31,30 @@ def test_uses_edgedriver_logging(clean_driver, driver_executable) -> None:
     log_file = "msedgedriver.log"
     service_args = ["--append-log"]
 
-    service = Service(
+    service1 = Service(
         log_output=log_file,
         service_args=service_args,
         executable_path=driver_executable,
     )
+
+    service2 = Service(
+        log_output=log_file,
+        service_args=service_args,
+        executable_path=driver_executable,
+    )
+
+    driver1 = None
     driver2 = None
     try:
-        driver1 = clean_driver(service=service)
+        driver1 = clean_driver(service=service1)
         with open(log_file) as fp:
             lines = len(fp.readlines())
-        driver2 = clean_driver(service=service)
+        driver2 = clean_driver(service=service2)
         with open(log_file) as fp:
             assert len(fp.readlines()) >= 2 * lines
     finally:
-        driver1.quit()
+        if driver1:
+            driver1.quit()
         if driver2:
             driver2.quit()
         os.remove(log_file)