Skip to content

wpt: Have ServoRefTestExecutor inherit from RefTestExecutor #55812

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 1 commit into from
Nov 1, 2025
Merged

wpt: Have ServoRefTestExecutor inherit from RefTestExecutor #55812

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
95 changes: 54 additions & 41 deletions tools/wptrunner/wptrunner/executors/executorservo.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,12 +13,11 @@

from tools.serve.serve import make_hosts_file

from .base import (RefTestImplementation,
from .base import (RefTestExecutor, RefTestImplementation, TestExecutor,
crashtest_result_converter,
testharness_result_converter,
reftest_result_converter,
TimedRunner)
from .process import ProcessTestExecutor
from .protocol import ConnectionlessProtocol
from ..browsers.base import browser_command

Expand All @@ -27,14 +26,22 @@
webdriver = None


class ServoExecutor(ProcessTestExecutor):
# A mixin class that includes functionality common to all Servo
# executors that work by spawing a new process. This is intended to
# be used along with either the `TestExecutor` class or its children
# and must be the first in the inheritance list to allow `super`
# to forward the calls to correct base class.
class ServoExecutorMixin:
def __init__(self, logger, browser, server_config, headless,
timeout_multiplier, debug_info,
timeout_multiplier, debug_info,
pause_after_test, reftest_screenshot="unexpected"):
ProcessTestExecutor.__init__(self, logger, browser, server_config,
timeout_multiplier=timeout_multiplier,
debug_info=debug_info,
reftest_screenshot=reftest_screenshot)
super().__init__(logger, browser, server_config,
timeout_multiplier=timeout_multiplier,
debug_info=debug_info,
reftest_screenshot=reftest_screenshot)
self.binary = self.browser.binary
self.interactive = (False if self.debug_info is None
else self.debug_info.interactive)
self.pause_after_test = pause_after_test
self.environment = {}
self.protocol = ConnectionlessProtocol(self, browser)
Expand All @@ -44,18 +51,23 @@ def __init__(self, logger, browser, server_config, headless,

hosts_fd, self.hosts_path = tempfile.mkstemp()
with os.fdopen(hosts_fd, "w") as f:
f.write(make_hosts_file(server_config, "127.0.0.1"))
f.write(make_hosts_file(self.server_config, "127.0.0.1"))

self.env_for_tests = os.environ.copy()
self.env_for_tests["HOST_FILE"] = self.hosts_path
self.env_for_tests["RUST_BACKTRACE"] = "1"

def setup(self, runner, protocol=None):
self.runner = runner
self.runner.send_message("init_succeeded")
return True

def teardown(self):
try:
os.unlink(self.hosts_path)
except OSError:
pass
ProcessTestExecutor.teardown(self)
super().teardown()

def on_environment_change(self, new_environment):
self.environment = new_environment
Expand Down Expand Up @@ -107,16 +119,17 @@ def build_servo_command(self, test, extra_args=None):
return debug_args + command


class ServoTestharnessExecutor(ServoExecutor):
class ServoTestharnessExecutor(ServoExecutorMixin, TestExecutor):
convert_result = testharness_result_converter

def __init__(self, logger, browser, server_config, headless,
timeout_multiplier=1, debug_info=None,
pause_after_test=False, **kwargs):
ServoExecutor.__init__(self, logger, browser, server_config, headless,
timeout_multiplier=timeout_multiplier,
debug_info=debug_info,
pause_after_test=pause_after_test)
super().__init__(logger, browser, server_config,
headless,
timeout_multiplier=timeout_multiplier,
debug_info=debug_info,
pause_after_test=pause_after_test)
self.result_data = None
self.result_flag = None

Expand Down Expand Up @@ -182,7 +195,7 @@ def on_output(self, line):
self.logger.error(f"Could not process test output JSON: {error}")
self.result_flag.set()
else:
ServoExecutor.on_output(self, line)
super().on_output(line)

def on_finish(self):
self.result_flag.set()
Expand All @@ -204,21 +217,20 @@ def __exit__(self, *args, **kwargs):
pass


class ServoRefTestExecutor(ServoExecutor):
class ServoRefTestExecutor(ServoExecutorMixin, RefTestExecutor):
convert_result = reftest_result_converter

def __init__(self, logger, browser, server_config, binary=None, timeout_multiplier=1,
screenshot_cache=None, debug_info=None, pause_after_test=False,
reftest_screenshot="unexpected", **kwargs):
ServoExecutor.__init__(self,
logger,
browser,
server_config,
headless=True,
timeout_multiplier=timeout_multiplier,
debug_info=debug_info,
reftest_screenshot=reftest_screenshot,
pause_after_test=pause_after_test)
super().__init__(logger,
browser,
server_config,
headless=True,
timeout_multiplier=timeout_multiplier,
debug_info=debug_info,
reftest_screenshot=reftest_screenshot,
pause_after_test=pause_after_test)

self.screenshot_cache = screenshot_cache
self.reftest_screenshot = reftest_screenshot
Expand All @@ -230,7 +242,7 @@ def reset(self):

def teardown(self):
os.rmdir(self.tempdir)
ServoExecutor.teardown(self)
super().teardown()

def screenshot(self, test, viewport_size, dpi, page_ranges):
with TempFilename(self.tempdir) as output_path:
Expand All @@ -239,7 +251,7 @@ def screenshot(self, test, viewport_size, dpi, page_ranges):
"--window-size", viewport_size or "800x600"]

if dpi:
extra_args += ["--device-pixel-ratio", dpi]
extra_args += ["--device-pixel-ratio", str(dpi)]

self.command = self.build_servo_command(test, extra_args)

Expand Down Expand Up @@ -278,6 +290,11 @@ def screenshot(self, test, viewport_size, dpi, page_ranges):
return True, [base64.b64encode(data).decode()]

def do_test(self, test):
# FIXME: This is a temporary fix until Servo syncs with upstream WPT.
# Once that happens, we can patch the `RefTestImplementation.get_screenshot_list`
# method to cast dpi to integer when using it in arithmetic expressions.
if test.dpi is not None:
test.dpi = int(test.dpi)
self.test = test
result = self.implementation.run_test(test)

Expand All @@ -301,23 +318,19 @@ def set_timeout(self):
pass


class ServoCrashtestExecutor(ServoExecutor):
class ServoCrashtestExecutor(ServoExecutorMixin, TestExecutor):
convert_result = crashtest_result_converter

def __init__(self, logger, browser, server_config, headless,
binary=None, timeout_multiplier=1, screenshot_cache=None,
debug_info=None, pause_after_test=False):
ServoExecutor.__init__(self,
logger,
browser,
server_config,
headless,
timeout_multiplier=timeout_multiplier,
debug_info=debug_info,
pause_after_test=pause_after_test)

self.pause_after_test = pause_after_test
self.protocol = ConnectionlessProtocol(self, browser)
debug_info=None, pause_after_test=False, **kwargs):
super().__init__(logger,
browser,
server_config,
headless,
timeout_multiplier=timeout_multiplier,
debug_info=debug_info,
pause_after_test=pause_after_test)

def do_test(self, test):
timeout = (test.timeout * self.timeout_multiplier if self.debug_info is None
Expand Down
22 changes: 0 additions & 22 deletions tools/wptrunner/wptrunner/executors/process.py
View file
Open in desktop

This file was deleted.

Loading