diff options
| author | Naïm Favier <n@monade.li> | 2022-03-18 01:27:04 +0100 |
|---|---|---|
| committer | Naïm Favier <n@monade.li> | 2022-03-18 02:44:11 +0100 |
| commit | ca8c877f8cd1f9b84e8aa57741aa5cd60a3a2ba3 (patch) | |
| tree | 9908d4c8cd984dbdaf355c320382b51e92b47580 /nixos/tests/chromium.nix | |
| parent | 79a234567c01399c5f1ae1d0b60ac84d12075b3b (diff) | |
nixos/tests: fix some evaluation errors
Fixes errors caught by "nixos/testing: restrict arguments to makeTest" as well as some unrelated errors and warnings.
Diffstat (limited to 'nixos/tests/chromium.nix')
| -rw-r--r-- | nixos/tests/chromium.nix | 38 |
1 files changed, 20 insertions, 18 deletions
diff --git a/nixos/tests/chromium.nix b/nixos/tests/chromium.nix index 8965646bc5dcf..3815dca762203 100644 --- a/nixos/tests/chromium.nix +++ b/nixos/tests/chromium.nix @@ -15,26 +15,9 @@ with import ../lib/testing-python.nix { inherit system pkgs; }; with pkgs.lib; -mapAttrs (channel: chromiumPkg: makeTest rec { - name = "chromium-${channel}"; - meta = { - maintainers = with maintainers; [ aszlig primeos ]; - # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621 - inherit (chromiumPkg.meta) timeout; - }; - - enableOCR = true; - +let user = "alice"; - machine.imports = [ ./common/user-account.nix ./common/x11.nix ]; - machine.virtualisation.memorySize = 2047; - machine.test-support.displayManager.auto.user = user; - machine.environment = { - systemPackages = [ chromiumPkg ]; - variables."XAUTHORITY" = "/home/alice/.Xauthority"; - }; - startupHTML = pkgs.writeText "chromium-startup.html" '' <!DOCTYPE html> <html> @@ -50,6 +33,25 @@ mapAttrs (channel: chromiumPkg: makeTest rec { </body> </html> ''; +in + +mapAttrs (channel: chromiumPkg: makeTest { + name = "chromium-${channel}"; + meta = { + maintainers = with maintainers; [ aszlig primeos ]; + # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621 + inherit (chromiumPkg.meta) timeout; + }; + + enableOCR = true; + + machine.imports = [ ./common/user-account.nix ./common/x11.nix ]; + machine.virtualisation.memorySize = 2047; + machine.test-support.displayManager.auto.user = user; + machine.environment = { + systemPackages = [ chromiumPkg ]; + variables."XAUTHORITY" = "/home/alice/.Xauthority"; + }; testScript = let xdo = name: text: let |