Commit 953ae3ff authored by Weizhong Xia's avatar Weizhong Xia Committed by aborovova@mozilla.com
Browse files

Bug 1967346 [wpt PR 52651] - Do not enable experimental features if running in stable release mode, 

Automatic update from web-platform-tests
Do not enable experimental features if running in stable release mode (#52651)

* Do not enable experimental features if running in stable release mode

We have a virtual test suite in Chromium to test behavior in this mode.
And we should not enable experimental features in this mode.

Bug: 418815739
--

wpt-commits: c518eee7a46a7f77a9721270c2b5d6af4cecdc03
wpt-pr: 52651

Differential Revision: https://phabricator.services.mozilla.com/D250959
parent 0df30af8

testing/web-platform/tests/tools/wpt/run.py

+3 −0
Original line number Diff line number Diff line
@@ -515,6 +515,9 @@ class Chrome(BrowserSetup): 
            if kwargs["enable_webtransport_h3"] is None:

                # To start the WebTransport over HTTP/3 test server.

                kwargs["enable_webtransport_h3"] = True

        elif browser_channel is not None:

            # browser_channel is not set when running WPT in chromium

            kwargs["enable_experimental"] = False

        if os.getenv("TASKCLUSTER_ROOT_URL"):

            # We are on Taskcluster, where our Docker container does not have

            # enough capabilities to run Chrome with sandboxing. (gh-20133)

testing/web-platform/tests/tools/wptrunner/wptrunner/browsers/chrome.py

+13 −3
Original line number Diff line number Diff line
@@ -174,16 +174,26 @@ def executor_kwargs(logger, test_type, test_environment, run_info_data, subsuite 
        # https://chromium.googlesource.com/chromium/src/+/HEAD/docs/gpu/swiftshader.md

        chrome_options["args"].extend(["--use-gl=angle", "--use-angle=swiftshader", "--enable-unsafe-swiftshader"])



    if kwargs["enable_experimental"]:

        chrome_options["args"].extend(["--enable-experimental-web-platform-features"])



    # Copy over any other flags that were passed in via `--binary-arg` or the

    # subsuite config.

    binary_args = kwargs.get("binary_args", []) + subsuite.config.get("binary_args", [])

    for arg in binary_args:

        if arg == "--stable-release-mode":

            continue

        if arg not in chrome_options["args"]:

            chrome_options["args"].append(arg)



    # Enable experimental features based on stable release mode setting. It is

    # unfortunately that we need to do this based on a content shell specific

    # setting, we choose to do this because we can not dynamically set

    # enable-experimental in run_wpt_tests.py.

    if kwargs["enable_experimental"] is None and "--stable-release-mode" not in binary_args:

        chrome_options["args"].extend(["--enable-experimental-web-platform-features",

                                       "--enable-blink-test-features"])



    # Upstream CI should always explicitly enable/disable experimental features.

    if kwargs["enable_experimental"]:

        chrome_options["args"].extend(["--enable-experimental-web-platform-features"])



    # Pass the --headless=new flag to Chrome if WPT's own --headless flag was

    # set. '--headless' should always mean the new headless mode, as the old