File tree Expand file tree Collapse file tree 3 files changed +16
-8
lines changed
java/src/org/openqa/selenium
py/selenium/webdriver/common Expand file tree Collapse file tree 3 files changed +16
-8
lines changed 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
Original file line number Diff line number Diff line change @@ -14,11 +14,14 @@ public class DriverFinder {
14
14
15
15
public static String getPath (DriverService service , Capabilities options ) {
16
16
Require .nonNull ("Browser options" , options );
17
- String defaultPath = new ExecutableFinder ().find (service .getDriverName ());
18
- String exePath = System .getProperty (service .getDriverProperty (), defaultPath );
17
+ String exePath = System .getProperty (service .getDriverProperty ());
18
+
19
+ if (exePath == null ) {
20
+ exePath = new ExecutableFinder ().find (service .getDriverName ());
21
+ }
19
22
20
23
if (service .getDriverExecutable () != null ) {
21
- // This is the case for Safari and Safari Technology Preview
24
+ // This is needed for Safari Technology Preview until Selenium Manager manages locating on PATH
22
25
exePath = service .getDriverExecutable ().getAbsolutePath ();
23
26
}
24
27
Original file line number Diff line number Diff line change @@ -56,6 +56,8 @@ def get_binary() -> Path:
56
56
if not path .is_file ():
57
57
raise WebDriverException (f"Unable to obtain working Selenium Manager binary; { path } " )
58
58
59
+ logger .debug ("Selenium Manager binary found at: {location}" )
60
+
59
61
return path
60
62
61
63
def driver_location (self , options : BaseOptions ) -> str :
@@ -114,12 +116,13 @@ def run(args: List[str]) -> str:
114
116
except Exception as err :
115
117
raise WebDriverException (f"Unsuccessful command executed: { command } ; { err } " )
116
118
119
+ for item in output ["logs" ]:
120
+ if item ["level" ] == "WARN" :
121
+ logger .warning (item ["message" ])
122
+ if item ["level" ] == "DEBUG" or item ["level" ] == "INFO" :
123
+ logger .debug (item ["message" ])
124
+
117
125
if completed_proc .returncode :
118
126
raise WebDriverException (f"Unsuccessful command executed: { command } .\n { result } { stderr } " )
119
127
else :
120
- for item in output ["logs" ]:
121
- if item ["level" ] == "WARN" :
122
- logger .warning (item ["message" ])
123
- if item ["level" ] == "DEBUG" or item ["level" ] == "INFO" :
124
- logger .debug (item ["message" ])
125
128
return result
You can’t perform that action at this time.
0 commit comments