movefasta/nixpkgs
1
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2025-06-11 04:05:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

nixos/tests/firefox: migrate to runTest

Browse source 
Part of #386873
This commit is contained in:
Martin Weinelt 2025-03-10 19:17:52 +01:00
parent 6af46873e5
commit 8ed2c5f961
No known key found for this signature in database
GPG key ID: 87C1E9888F856759
2 changed files with 35 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

26
nixos/tests/all-tests.nix
View file

@ -387,11 +387,27 @@ in {
filesystems-overlayfs = runTest ./filesystems-overlayfs.nix; filesystems-overlayfs = runTest ./filesystems-overlayfs.nix;
firefly-iii = handleTest ./firefly-iii.nix {}; firefly-iii = handleTest ./firefly-iii.nix {};
firefly-iii-data-importer = handleTest ./firefly-iii-data-importer.nix {}; firefly-iii-data-importer = handleTest ./firefly-iii-data-importer.nix {};
firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; }; firefox = runTest {
firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; }; imports = [./firefox.nix ];
firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; }; _module.args.firefoxPackage = pkgs.firefox;
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-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 {}; firefoxpwa = handleTest ./firefoxpwa.nix {};
firejail = handleTest ./firejail.nix {}; firejail = handleTest ./firejail.nix {};
firewall = handleTest ./firewall.nix { nftables = false; }; firewall = handleTest ./firewall.nix { nftables = false; };

18
nixos/tests/firefox.nix
View file

@ -1,4 +1,9 @@
import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }: {
lib,
pkgs,
firefoxPackage,
...
}:
{ {
name = firefoxPackage.pname; name = firefoxPackage.pname;
@ -9,7 +14,8 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }:
nodes.machine = nodes.machine =
{ pkgs, ... }: { pkgs, ... }:
{ imports = [ ./common/x11.nix ]; {
imports = [ ./common/x11.nix ];
environment.systemPackages = [ pkgs.xdotool ]; environment.systemPackages = [ pkgs.xdotool ];
programs.firefox = { programs.firefox = {
@ -31,9 +37,11 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }:
}; };
testScript = let testScript =
let
exe = lib.getExe firefoxPackage; exe = lib.getExe firefoxPackage;
in '' in
''
from contextlib import contextmanager from contextlib import contextmanager
@ -97,4 +105,4 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }:
machine.screenshot("screen") machine.screenshot("screen")
''; '';
}) }