ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-27 22:03:54 +03:00
Code Issues Projects Releases Wiki Activity

nixos/tests/firefox: support running the test with the firefox ESR version

Browse Source 
Also adds this to the release jobset.
This commit is contained in:
Andreas Rammhold 2020-02-10 18:01:47 +01:00
parent f43fdd1151
commit 7a625e7453
No known key found for this signature in database
GPG Key ID: E432E410B5E48C86
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
nixos/release-combined.nix
View File

@ -66,6 +66,7 @@ in rec {
(all nixos.tests.containers-ip) (all nixos.tests.containers-ip)
nixos.tests.chromium.x86_64-linux or [] nixos.tests.chromium.x86_64-linux or []
(all nixos.tests.firefox) (all nixos.tests.firefox)
(all nixos.tests.firefox-esr)
(all nixos.tests.firewall) (all nixos.tests.firewall)
(all nixos.tests.fontconfig-default-fonts) (all nixos.tests.fontconfig-default-fonts)
(all nixos.tests.gnome3-xorg) (all nixos.tests.gnome3-xorg)

1
nixos/tests/all-tests.nix
View File

@ -88,6 +88,7 @@ in
fancontrol = handleTest ./fancontrol.nix {}; fancontrol = handleTest ./fancontrol.nix {};
ferm = handleTest ./ferm.nix {}; ferm = handleTest ./ferm.nix {};
firefox = handleTest ./firefox.nix {}; firefox = handleTest ./firefox.nix {};
firefox-esr = handleTest ./firefox.nix { esr = true; };
firewall = handleTest ./firewall.nix {}; firewall = handleTest ./firewall.nix {};
fish = handleTest ./fish.nix {}; fish = handleTest ./fish.nix {};
flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {};

6
nixos/tests/firefox.nix
View File

@ -1,4 +1,4 @@
import ./make-test-python.nix ({ pkgs, ... }: { import ./make-test-python.nix ({ pkgs, esr ? false, ... }: {
name = "firefox"; name = "firefox";
meta = with pkgs.stdenv.lib.maintainers; { meta = with pkgs.stdenv.lib.maintainers; {
maintainers = [ eelco shlevy ]; maintainers = [ eelco shlevy ];
@ -8,7 +8,9 @@ import ./make-test-python.nix ({ pkgs, ... }: {
{ pkgs, ... }: { pkgs, ... }:
{ imports = [ ./common/x11.nix ]; { imports = [ ./common/x11.nix ];
environment.systemPackages = [ pkgs.firefox pkgs.xdotool ]; environment.systemPackages =
(if esr then [ pkgs.firefox-esr ] else [ pkgs.firefox ])
++ [ pkgs.xdotool ];
}; };
testScript = '' testScript = ''