Browse Source
nixos/tests/firefox: support running the test with the firefox ESR version
Also adds this to the release jobset.
nsd-state-dir
Andreas Rammhold
4 years ago
No known key found for this signature in database
GPG Key ID: E432E410B5E48C86
3 changed files with
6 additions and
2 deletions
-
nixos/release-combined.nix
-
nixos/tests/all-tests.nix
-
nixos/tests/firefox.nix
|
|
|
@ -66,6 +66,7 @@ in rec { |
|
|
|
(all nixos.tests.containers-ip) |
|
|
|
nixos.tests.chromium.x86_64-linux or [] |
|
|
|
(all nixos.tests.firefox) |
|
|
|
(all nixos.tests.firefox-esr) |
|
|
|
(all nixos.tests.firewall) |
|
|
|
(all nixos.tests.fontconfig-default-fonts) |
|
|
|
(all nixos.tests.gnome3-xorg) |
|
|
|
|
|
|
|
@ -88,6 +88,7 @@ in |
|
|
|
fancontrol = handleTest ./fancontrol.nix {}; |
|
|
|
ferm = handleTest ./ferm.nix {}; |
|
|
|
firefox = handleTest ./firefox.nix {}; |
|
|
|
firefox-esr = handleTest ./firefox.nix { esr = true; }; |
|
|
|
firewall = handleTest ./firewall.nix {}; |
|
|
|
fish = handleTest ./fish.nix {}; |
|
|
|
flannel = handleTestOn ["x86_64-linux"] ./flannel.nix {}; |
|
|
|
|
|
|
|
@ -1,4 +1,4 @@ |
|
|
|
import ./make-test-python.nix ({ pkgs, ... }: { |
|
|
|
import ./make-test-python.nix ({ pkgs, esr ? false, ... }: { |
|
|
|
name = "firefox"; |
|
|
|
meta = with pkgs.stdenv.lib.maintainers; { |
|
|
|
maintainers = [ eelco shlevy ]; |
|
|
|
@ -8,7 +8,9 @@ import ./make-test-python.nix ({ pkgs, ... }: { |
|
|
|
{ pkgs, ... }: |
|
|
|
|
|
|
|
{ imports = [ ./common/x11.nix ]; |
|
|
|
environment.systemPackages = [ pkgs.firefox pkgs.xdotool ]; |
|
|
|
environment.systemPackages = |
|
|
|
(if esr then [ pkgs.firefox-esr ] else [ pkgs.firefox ]) |
|
|
|
++ [ pkgs.xdotool ]; |
|
|
|
}; |
|
|
|
|
|
|
|
testScript = '' |
|
|
|
|
