Unverified Commit f8fae712 authored by Michael Weiss's avatar Michael Weiss Committed by GitHub
Browse files

Merge pull request #197611 from primeos/nixos-tests-chromium 

nixos/tests/chromium: Fixes for Google Chrome and M107+
parents 4176364f 5389fbe7

nixos/tests/chromium.nix

+10 −4
Original line number Diff line number Diff line
@@ -39,7 +39,9 @@ mapAttrs (channel: chromiumPkg: makeTest { 
  name = "chromium-${channel}";

  meta = {

    maintainers = with maintainers; [ aszlig primeos ];

  } // optionalAttrs (chromiumPkg.meta ? timeout) {

    # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621

    # Note: optionalAttrs is used since meta.timeout is not set for Google Chrome

    inherit (chromiumPkg.meta) timeout;

  };
@@ -65,6 +67,9 @@ mapAttrs (channel: chromiumPkg: makeTest { 
    from contextlib import contextmanager





    major_version = "${versions.major (getVersion chromiumPkg.name)}"





    # Run as user alice

    def ru(cmd):

        return "su - ${user} -c " + shlex.quote(cmd)
@@ -84,7 +89,6 @@ mapAttrs (channel: chromiumPkg: makeTest { 
            binary = pname

        # Add optional CLI options:

        options = []

        major_version = "${versions.major (getVersion chromiumPkg.name)}"

        if major_version > "95" and not pname.startswith("google-chrome"):

            # Workaround to avoid a GPU crash:

            options.append("--use-gl=swiftshader")
@@ -242,6 +246,8 @@ mapAttrs (channel: chromiumPkg: makeTest { 
        machine.screenshot("after_copy_from_chromium")





    if major_version < "107":

        # TODO: Fix the chrome://gpu test for M107+

        with test_new_win("gpu_info", "chrome://gpu", "chrome://gpu"):

            # To check the text rendering (catches regressions like #131074):

            machine.wait_for_text("Graphics Feature Status")