Skip to content

[py] Fix chromedriver/msedgedriver service tests #16395

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Oct 7, 2025
Merged

[py] Fix chromedriver/msedgedriver service tests #16395

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
b88be09
[py] Fix chromedriver/msedgedriver service tests
cgoldberg Oct 7, 2025
6516203
[py] Move asserts out of context manager
cgoldberg Oct 7, 2025
ddda086
[py] Fix assertions
cgoldberg Oct 7, 2025
42734c7
[py] Add sleeps to wait for logging
cgoldberg Oct 7, 2025
e6a928d
[py] Remove sleeps
cgoldberg Oct 7, 2025
3731b88
[py] Refactor logging reuse test
cgoldberg Oct 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 21 additions & 19 deletions py/test/selenium/webdriver/chrome/chrome_service_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import os
import subprocess
import sys
import time
from unittest.mock import patch

import pytest
Expand All @@ -28,36 +27,35 @@


@pytest.mark.no_driver_after_test
def test_uses_chromedriver_logging(clean_driver, clean_options, driver_executable) -> None:
def test_reuses_chromedriver_log(clean_driver, clean_options, driver_executable) -> None:
log_file = "chromedriver.log"
service_args = ["--append-log"]

service1 = Service(
log_output=log_file,
service_args=service_args,
executable_path=driver_executable,
)

service2 = Service(
log_output=log_file,
service_args=service_args,
service_args=["--append-log"],
executable_path=driver_executable,
)

driver1 = None
driver2 = None
driver = None
try:
driver1 = clean_driver(options=clean_options, service=service1)
driver = clean_driver(options=clean_options, service=service1)
with open(log_file) as fp:
lines = len(fp.readlines())
driver2 = clean_driver(options=clean_options, service=service2)
finally:
if driver:
driver.quit()
try:
driver = clean_driver(options=clean_options, service=service2)
with open(log_file) as fp:
assert len(fp.readlines()) >= 2 * lines
finally:
if driver1:
driver1.quit()
if driver2:
driver2.quit()
if driver:
driver.quit()
os.remove(log_file)


Expand All @@ -69,7 +67,9 @@ def test_log_output_as_filename(clean_driver, clean_options, driver_executable)
assert "--log-path=chromedriver.log" in service.service_args
driver = clean_driver(options=clean_options, service=service)
with open(log_file) as fp:
assert "Starting ChromeDriver" in fp.readline()
out = fp.read()
assert "Starting" in out
assert "started successfully" in out
finally:
driver.quit()
os.remove(log_file)
Expand All @@ -82,9 +82,10 @@ def test_log_output_as_file(clean_driver, clean_options, driver_executable) -> N
service = Service(log_output=log_file, executable_path=driver_executable)
try:
driver = clean_driver(options=clean_options, service=service)
time.sleep(1)
with open(log_name) as fp:
assert "Starting ChromeDriver" in fp.readline()
out = fp.read()
assert "Starting" in out
assert "started successfully" in out
finally:
driver.quit()
log_file.close()
Expand All @@ -95,16 +96,17 @@ def test_log_output_as_file(clean_driver, clean_options, driver_executable) -> N
def test_log_output_as_stdout(clean_driver, clean_options, capfd, driver_executable) -> None:
service = Service(log_output=subprocess.STDOUT, executable_path=driver_executable)
driver = clean_driver(options=clean_options, service=service)

out, err = capfd.readouterr()
assert "Starting ChromeDriver" in out
assert "Starting" in out
assert "started successfully" in out
driver.quit()


@pytest.mark.no_driver_after_test
def test_log_output_null_default(driver, capfd) -> None:
out, err = capfd.readouterr()
assert "Starting ChromeDriver" not in out
assert "Starting" not in out
assert "started successfully" not in out
driver.quit()


Expand Down
40 changes: 21 additions & 19 deletions py/test/selenium/webdriver/edge/edge_service_tests.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
import os
import subprocess
import sys
import time
from unittest.mock import patch

import pytest
Expand All @@ -28,36 +27,35 @@


@pytest.mark.no_driver_after_test
def test_uses_edgedriver_logging(clean_driver, clean_options, driver_executable) -> None:
def test_reuses_edgedriver_log(clean_driver, clean_options, driver_executable) -> None:
log_file = "msedgedriver.log"
service_args = ["--append-log"]

service1 = Service(
log_output=log_file,
service_args=service_args,
executable_path=driver_executable,
)

service2 = Service(
log_output=log_file,
service_args=service_args,
service_args=["--append-log"],
executable_path=driver_executable,
)

driver1 = None
driver2 = None
driver = None
try:
driver1 = clean_driver(options=clean_options, service=service1)
driver = clean_driver(options=clean_options, service=service1)
with open(log_file) as fp:
lines = len(fp.readlines())
driver2 = clean_driver(options=clean_options, service=service2)
finally:
if driver:
driver.quit()
try:
driver = clean_driver(options=clean_options, service=service2)
with open(log_file) as fp:
assert len(fp.readlines()) >= 2 * lines
finally:
if driver1:
driver1.quit()
if driver2:
driver2.quit()
if driver:
driver.quit()
os.remove(log_file)


Expand All @@ -69,7 +67,9 @@ def test_log_output_as_filename(clean_driver, clean_options, driver_executable)
assert "--log-path=msedgedriver.log" in service.service_args
driver = clean_driver(options=clean_options, service=service)
with open(log_file) as fp:
assert "Starting Microsoft Edge WebDriver" in fp.readline()
out = fp.read()
assert "Starting" in out
assert "started successfully" in out
finally:
driver.quit()
os.remove(log_file)
Expand All @@ -82,9 +82,10 @@ def test_log_output_as_file(clean_driver, clean_options, driver_executable) -> N
service = Service(log_output=log_file, executable_path=driver_executable)
try:
driver = clean_driver(options=clean_options, service=service)
time.sleep(1)
with open(log_name) as fp:
assert "Starting msedgedriver" in fp.readline()
out = fp.read()
assert "Starting" in out
assert "started successfully" in out
finally:
driver.quit()
log_file.close()
Expand All @@ -95,16 +96,17 @@ def test_log_output_as_file(clean_driver, clean_options, driver_executable) -> N
def test_log_output_as_stdout(clean_driver, clean_options, capfd, driver_executable) -> None:
service = Service(log_output=subprocess.STDOUT, executable_path=driver_executable)
driver = clean_driver(options=clean_options, service=service)

out, err = capfd.readouterr()
assert "Starting msedgedriver" in out
assert "Starting" in out
assert "started successfully" in out
driver.quit()


@pytest.mark.no_driver_after_test
def test_log_output_null_default(driver, capfd) -> None:
out, err = capfd.readouterr()
assert "Starting Microsoft Edge WebDriver" not in out
assert "Starting" not in out
assert "started successfully" not in out
driver.quit()


Expand Down