Skip to content

Conversation

@servo-wpt-sync
Copy link
Collaborator

Since ProcessTestExecutor is only used by Servo and doesn't add much
on top of ServoExecutor, merge the former into the latter.

Also make ServoExecutor a mixin so that the derived classes can
inherit from upstream wptrunner's classes and avoid the diamond
inheritance of TestExecutor base class.

Another issue is that new changes in the
RefTestImplementation.get_screenshot_list method upstream conflicts
with the assumptions in Servo's executor:

  • The dpi argument is used as an int although it is a string
  • The viewport_size argument is treated as a tuple of ints but it is
    in fact a string of the format WxH. It also treats the viewport
    dimensions as being specified in device pixel coordinates while
    Servo treats it as logical coordinates and will scale it by dpi.

These issues need to discussed with upstream and patched in
RefTestImplementation.

Finally, add back **kwargs argument to ServoCrashtestExecutor's
constructor to fix #40322.

Testing: Tested on fork with changes from upstream's base executor.
Fixes #40288
Fixes #40322

Reviewed in servo/servo#40327

Since `ProcessTestExecutor` is only used by Servo and doesn't add much
on top of `ServoExecutor`, merge the former into the latter.

Also make `ServoExecutor` a mixin so that the derived classes can
inherit from upstream `wptrunner`'s classes and avoid the diamond
inheritance of `TestExecutor` base class.

Another issue is that new changes in the
`RefTestImplementation.get_screenshot_list` method upstream conflicts
with the assumptions in Servo's executor:
  - The `dpi` argument is used as an `int` although it is a string
  - The `viewport_size` argument is treated as a tuple of ints but it is
    in fact a string of the format `WxH`. It also treats the viewport
    dimensions as being specified in device pixel coordinates while
    Servo treats it as logical coordinates and will scale it by `dpi`.

These issues need to discussed with upstream and patched in
`RefTestImplementation`.

Finally, add back `**kwargs` argument to `ServoCrashtestExecutor`'s
constructor to fix web-platform-tests#40322.

Fixes web-platform-tests#40288, web-platform-tests#40322

Signed-off-by: Mukilan Thiyagarajan <[email protected]>
Copy link
Collaborator

@wpt-pr-bot wpt-pr-bot left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The review process for this patch is being conducted in the Servo project.

@servo-wpt-sync
Copy link
Collaborator Author

⛔ The downstream PR has merged (servo/servo#40327), but these changes could not be merged properly. Please address any CI issues and try to merge manually.

@servo-wpt-sync servo-wpt-sync added the stale-servo-export PRs that were supposed to merge but were not able to do so. label Nov 1, 2025
@TimvdLippe
Copy link
Contributor

@jdm can you give this one a nudge? Seems like an unrelated Safari infrastructure issue to me

@jdm jdm merged commit bd278f4 into web-platform-tests:master Nov 1, 2025
33 of 36 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

infra servo-export stale-servo-export PRs that were supposed to merge but were not able to do so. wptrunner The automated test runner, commonly called through ./wpt run

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants