Unverified Commit 8ed2c5f9 authored by Martin Weinelt's avatar Martin Weinelt
Browse files

nixos/tests/firefox: migrate to runTest 

Part of #386873
parent 6af46873

nixos/tests/all-tests.nix

+21 −5
Original line number Diff line number Diff line
@@ -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; };

nixos/tests/firefox.nix

+14 −6
Original line number Diff line number Diff line 
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

  testScript =

    let

      exe = lib.getExe firefoxPackage;

  in ''

    in

    ''

      from contextlib import contextmanager
@@ -97,4 +105,4 @@ import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }: 
          machine.screenshot("screen")

    '';



})
 
}