Skip to content

Commit 38e658a

Browse files
titusfortnertitusfortner
authored
update how selenium manager logs (#12145)
1 parent f2c1192 commit 38e658a

4 files changed

Lines changed: 15 additions & 25 deletions

File tree

‎java/src/org/openqa/selenium/manager/SeleniumManager.java‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,6 +59,7 @@ public class SeleniumManager {
5959

6060
private static final String SELENIUM_MANAGER = "selenium-manager";
6161
private static final String EXE = ".exe";
62+
private static final String INFO = "INFO";
6263
private static final String WARN = "WARN";
6364
private static final String DEBUG = "DEBUG";
6465

@@ -135,7 +136,7 @@ private static String runCommand(String... command) {
135136
if (logged.level.equalsIgnoreCase(WARN)) {
136137
LOG.warning(logged.message);
137138
}
138-
if (logged.level.equalsIgnoreCase(DEBUG)) {
139+
if (logged.level.equalsIgnoreCase(DEBUG) || logged.level.equalsIgnoreCase(INFO)) {
139140
LOG.fine(logged.message);
140141
}
141142
});
@@ -209,7 +210,7 @@ private String getBrowserBinary(Capabilities options) {
209210
* @return the location of the driver.
210211
*/
211212
public String getDriverPath(Capabilities options) {
212-
LOG.info("Applicable driver not found; attempting to install with Selenium Manager (Beta)");
213+
LOG.fine("Applicable driver not found; attempting to install with Selenium Manager (Beta)");
213214
File binaryFile = getBinary();
214215
if (binaryFile == null) {
215216
return null;

‎py/selenium/webdriver/common/selenium_manager.py‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ def driver_location(self, options: BaseOptions) -> str:
7070
:Returns: The driver path to use
7171
"""
7272

73-
logger.info("Applicable driver not found; attempting to install with Selenium Manager (Beta)")
73+
logger.debug("Applicable driver not found; attempting to install with Selenium Manager (Beta)")
7474

7575
browser = options.capabilities["browserName"]
7676

@@ -121,6 +121,6 @@ def run(args: List[str]) -> str:
121121
for item in output["logs"]:
122122
if item["level"] == "WARN":
123123
logger.warning(item["message"])
124-
if item["level"] == "DEBUG":
124+
if item["level"] == "DEBUG" or item["level"] == "INFO":
125125
logger.debug(item["message"])
126126
return result

‎rb/lib/selenium/webdriver/common/selenium_manager.rb‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ def bin_path
3838
# @return [String] the path to the correct driver.
3939
def driver_path(options)
4040
message = 'applicable driver not found; attempting to install with Selenium Manager (Beta)'
41-
WebDriver.logger.info(message, id: :selenium_manager)
41+
WebDriver.logger.debug(message, id: :selenium_manager)
4242

4343
unless options.is_a?(Options)
4444
raise ArgumentError, "SeleniumManager requires a WebDriver::Options instance, not #{options.inspect}"
@@ -106,7 +106,8 @@ def run(*command)
106106
end
107107

108108
(json_output&.fetch('logs') || []).each do |log|
109-
WebDriver.logger.send(log['level'].downcase, log['message'], id: :selenium_manager)
109+
level = log['level'].casecmp('info').zero? ? 'debug' : log['level'].downcase
110+
WebDriver.logger.send(level, log['message'], id: :selenium_manager)
110111
end
111112

112113
if status.exitstatus.positive?

‎rb/spec/unit/selenium/webdriver/common/selenium_manager_spec.rb‎

Lines changed: 7 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -76,20 +76,16 @@ def stub_binary(binary)
7676
describe 'self.driver_path' do
7777
it 'errors if not an option' do
7878
expect {
79-
expect {
80-
described_class.driver_path(Remote::Capabilities.new(browser_name: 'chrome'))
81-
}.to raise_error(ArgumentError, /SeleniumManager requires a WebDriver::Options instance/)
82-
}.to have_warning(:selenium_manager)
79+
described_class.driver_path(Remote::Capabilities.new(browser_name: 'chrome'))
80+
}.to raise_error(ArgumentError, /SeleniumManager requires a WebDriver::Options instance/)
8381
end
8482

8583
it 'determines browser name by default' do
8684
allow(described_class).to receive(:run)
8785
allow(described_class).to receive(:binary).and_return('selenium-manager')
8886
allow(Platform).to receive(:assert_executable)
8987

90-
expect {
91-
described_class.driver_path(Options.chrome)
92-
}.to have_warning(:selenium_manager)
88+
described_class.driver_path(Options.chrome)
9389

9490
expect(described_class).to have_received(:run)
9591
.with('selenium-manager', '--browser', 'chrome', '--output', 'json')
@@ -101,9 +97,7 @@ def stub_binary(binary)
10197
allow(Platform).to receive(:assert_executable)
10298
options = Options.chrome(browser_version: 1)
10399

104-
expect {
105-
described_class.driver_path(options)
106-
}.to have_warning(:selenium_manager)
100+
described_class.driver_path(options)
107101

108102
expect(described_class).to have_received(:run)
109103
.with('selenium-manager',
@@ -119,9 +113,7 @@ def stub_binary(binary)
119113
allow(Platform).to receive(:assert_executable)
120114
options = Options.chrome(proxy: proxy)
121115

122-
expect {
123-
described_class.driver_path(options)
124-
}.to have_warning(:selenium_manager)
116+
described_class.driver_path(options)
125117

126118
expect(described_class).to have_received(:run)
127119
.with('selenium-manager',
@@ -136,9 +128,7 @@ def stub_binary(binary)
136128
allow(Platform).to receive(:assert_executable)
137129
options = Options.chrome(binary: '/path/to/browser')
138130

139-
expect {
140-
described_class.driver_path(options)
141-
}.to have_warning(:selenium_manager)
131+
described_class.driver_path(options)
142132

143133
expect(described_class).to have_received(:run)
144134
.with('selenium-manager', '--browser', 'chrome', '--output', 'json', '--browser-path', '/path/to/browser')
@@ -150,9 +140,7 @@ def stub_binary(binary)
150140
allow(Platform).to receive(:assert_executable)
151141
options = Options.chrome(binary: '/path to/the/browser')
152142

153-
expect {
154-
described_class.driver_path(options)
155-
}.to have_warning(:selenium_manager)
143+
described_class.driver_path(options)
156144

157145
expect(described_class).to have_received(:run)
158146
.with('selenium-manager', '--browser', 'chrome', '--output', 'json',

0 commit comments

Comments
 (0)