From 8ed2c5f96192addbf8e83dff1080df7ba2c15ca9 Mon Sep 17 00:00:00 2001 From: Martin Weinelt Date: Mon, 10 Mar 2025 19:17:52 +0100 Subject: [PATCH] nixos/tests/firefox: migrate to runTest Part of #386873 --- nixos/tests/all-tests.nix | 26 +++++++++++++++++++++----- nixos/tests/firefox.nix | 20 ++++++++++++++------ 2 files changed, 35 insertions(+), 11 deletions(-) diff --git a/nixos/tests/all-tests.nix b/nixos/tests/all-tests.nix index e8f38da60ab6..fc7ea0a75ae7 100644 --- a/nixos/tests/all-tests.nix +++ b/nixos/tests/all-tests.nix @@ -387,11 +387,27 @@ in { filesystems-overlayfs = runTest ./filesystems-overlayfs.nix; firefly-iii = handleTest ./firefly-iii.nix {}; firefly-iii-data-importer = handleTest ./firefly-iii-data-importer.nix {}; - firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; - firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; }; - firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; }; - firefox-esr = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job - firefox-esr-128 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-128; }; + firefox = runTest { + imports = [./firefox.nix ]; + _module.args.firefoxPackage = pkgs.firefox; + }; + firefox-beta = runTest { + imports = [ ./firefox.nix ] ; + _module.args.firefoxPackage = pkgs.firefox-beta; + }; + firefox-devedition = runTest { + imports = [ ./firefox.nix ]; + _module.args.firefoxPackage = pkgs.firefox-devedition; + }; + firefox-esr = runTest { + # used in `tested` job + imports = [ ./firefox.nix ] ; + _module.args.firefoxPackage = pkgs.firefox-esr; + }; + firefox-esr-128 = runTest { + imports = [ ./firefox.nix ] ; + _module.args.firefoxPackage = pkgs.firefox-esr-128; + }; firefoxpwa = handleTest ./firefoxpwa.nix {}; firejail = handleTest ./firejail.nix {}; firewall = handleTest ./firewall.nix { nftables = false; }; diff --git a/nixos/tests/firefox.nix b/nixos/tests/firefox.nix index 9388af953a35..53dac8c3b794 100644 --- a/nixos/tests/firefox.nix +++ b/nixos/tests/firefox.nix @@ -1,4 +1,9 @@ -import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }: +{ + lib, + pkgs, + firefoxPackage, + ... +}: { name = firefoxPackage.pname; @@ -9,7 +14,8 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }: nodes.machine = { pkgs, ... }: - { imports = [ ./common/x11.nix ]; + { + imports = [ ./common/x11.nix ]; environment.systemPackages = [ pkgs.xdotool ]; programs.firefox = { @@ -31,9 +37,11 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }: }; - testScript = let - exe = lib.getExe firefoxPackage; - in '' + testScript = + let + exe = lib.getExe firefoxPackage; + in + '' from contextlib import contextmanager @@ -97,4 +105,4 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }: machine.screenshot("screen") ''; -}) +}