few tweaks to driver finding logic (#12269)

titusfortner · diemol · web-flow · commit d05ab6fa1710 · 2023-06-28T13:33:32.000+02:00
few tweaks to driver finding logic based on comparison between implementations

Co-authored-by: Diego Molina &lt;diemol@users.noreply.github.com&gt;
diff --git a/java/src/org/openqa/selenium/manager/SeleniumManager.java b/java/src/org/openqa/selenium/manager/SeleniumManager.java
@@ -191,6 +191,8 @@ private synchronized File getBinary() {
         throw new WebDriverException("Unable to obtain Selenium Manager Binary", e);
       }
     }
+    LOG.fine(String.format("Selenium Manager binary found at: %s", binary));
+
     return binary;
   }
 
diff --git a/java/src/org/openqa/selenium/remote/service/DriverFinder.java b/java/src/org/openqa/selenium/remote/service/DriverFinder.java
@@ -14,11 +14,14 @@ public class DriverFinder {
 
   public static String getPath(DriverService service, Capabilities options) {
     Require.nonNull("Browser options", options);
-    String defaultPath = new ExecutableFinder().find(service.getDriverName());
-    String exePath = System.getProperty(service.getDriverProperty(), defaultPath);
+    String exePath = System.getProperty(service.getDriverProperty());
+
+    if (exePath == null) {
+      exePath = new ExecutableFinder().find(service.getDriverName());
+    }
 
     if (service.getDriverExecutable() != null) {
-      // This is the case for Safari and Safari Technology Preview
+      // This is needed for Safari Technology Preview until Selenium Manager manages locating on PATH
       exePath = service.getDriverExecutable().getAbsolutePath();
     }
 
diff --git a/py/selenium/webdriver/common/selenium_manager.py b/py/selenium/webdriver/common/selenium_manager.py
@@ -56,6 +56,8 @@ def get_binary() -> Path:
         if not path.is_file():
             raise WebDriverException(f"Unable to obtain working Selenium Manager binary; {path}")
 
+        logger.debug("Selenium Manager binary found at: {location}")
+
         return path
 
     def driver_location(self, options: BaseOptions) -> str:
@@ -114,12 +116,13 @@ def run(args: List[str]) -> str:
         except Exception as err:
             raise WebDriverException(f"Unsuccessful command executed: {command}; {err}")
 
+        for item in output["logs"]:
+            if item["level"] == "WARN":
+                logger.warning(item["message"])
+            if item["level"] == "DEBUG" or item["level"] == "INFO":
+                logger.debug(item["message"])
+
         if completed_proc.returncode:
             raise WebDriverException(f"Unsuccessful command executed: {command}.\n{result}{stderr}")
         else:
-            for item in output["logs"]:
-                if item["level"] == "WARN":
-                    logger.warning(item["message"])
-                if item["level"] == "DEBUG" or item["level"] == "INFO":
-                    logger.debug(item["message"])
             return result

Original file line number	Diff line number	Diff line change
`@@ -191,6 +191,8 @@ private synchronized File getBinary() {`
`191`	`191`	`throw new WebDriverException("Unable to obtain Selenium Manager Binary", e);`
`192`	`192`	`}`
`193`	`193`	`}`
	`194`	`+ LOG.fine(String.format("Selenium Manager binary found at: %s", binary));`
	`195`	`+`
`194`	`196`	`return binary;`
`195`	`197`	`}`
`196`	`198`