commit 8ed2c5f96192addbf8e83dff1080df7ba2c15ca9 · pyrox.dev/nixpkgs

+21 -5

nixos/tests/all-tests.nix

···

       387
       387
        
         filesystems-overlayfs = runTest ./filesystems-overlayfs.nix;

     

       388
       388
        
         firefly-iii = handleTest ./firefly-iii.nix {};

     

       389
       389
        
         firefly-iii-data-importer = handleTest ./firefly-iii-data-importer.nix {};

     

       390
       390
       -
         firefox = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox; };

     

       391
       391
       -
         firefox-beta = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-beta; };

     

       392
       392
       -
         firefox-devedition = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-devedition; };

     

       393
       393
       -
         firefox-esr    = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr; }; # used in `tested` job

     

       394
       394
       -
         firefox-esr-128 = handleTest ./firefox.nix { firefoxPackage = pkgs.firefox-esr-128; };

     

       390
       390
       +
         firefox = runTest {

     

       391
       391
       +
           imports = [./firefox.nix ];

     

       392
       392
       +
           _module.args.firefoxPackage = pkgs.firefox;

     

       393
       393
       +
         };

     

       394
       394
       +
         firefox-beta = runTest {

     

       395
       395
       +
           imports = [ ./firefox.nix ] ;

     

       396
       396
       +
           _module.args.firefoxPackage = pkgs.firefox-beta;

     

       397
       397
       +
         };

     

       398
       398
       +
         firefox-devedition = runTest {

     

       399
       399
       +
           imports = [ ./firefox.nix ];

     

       400
       400
       +
           _module.args.firefoxPackage = pkgs.firefox-devedition;

     

       401
       401
       +
         };

     

       402
       402
       +
         firefox-esr = runTest {

     

       403
       403
       +
            # used in `tested` job

     

       404
       404
       +
           imports = [ ./firefox.nix ] ;

     

       405
       405
       +
           _module.args.firefoxPackage = pkgs.firefox-esr;

     

       406
       406
       +
         };

     

       407
       407
       +
         firefox-esr-128 = runTest {

     

       408
       408
       +
           imports = [ ./firefox.nix ] ;

     

       409
       409
       +
           _module.args.firefoxPackage = pkgs.firefox-esr-128;

     

       410
       410
       +
         };

     

       395
       411
        
         firefoxpwa = handleTest ./firefoxpwa.nix {};

     

       396
       412
        
         firejail = handleTest ./firejail.nix {};

     

       397
       413
        
         firewall = handleTest ./firewall.nix { nftables = false; };

+14 -6

nixos/tests/firefox.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ lib, pkgs, firefoxPackage, ... }:

     

       1
       1
       +
       {

     

       2
       2
       +
         lib,

     

       3
       3
       +
         pkgs,

     

       4
       4
       +
         firefoxPackage,

     

       5
       5
       +
         ...

     

       6
       6
       +
       }:

     

       2
       7
        
       {

     

       3
       8
        
         name = firefoxPackage.pname;

     

       4
       9
        
       

     
···

       9
       14
        
         nodes.machine =

     

       10
       15
        
           { pkgs, ... }:

     

       11
       16
        
       

     

       12
       12
       -
           { imports = [ ./common/x11.nix ];

     

       17
       17
       +
           {

     

       18
       18
       +
             imports = [ ./common/x11.nix ];

     

       13
       19
        
             environment.systemPackages = [ pkgs.xdotool ];

     

       14
       20
        
       

     

       15
       21
        
             programs.firefox = {

     
···

       31
       37
        
       

     

       32
       38
        
           };

     

       33
       39
        
       

     

       34
       34
       -
         testScript = let

     

       35
       35
       -
           exe = lib.getExe firefoxPackage;

     

       36
       36
       -
         in ''

     

       40
       40
       +
         testScript =

     

       41
       41
       +
           let

     

       42
       42
       +
             exe = lib.getExe firefoxPackage;

     

       43
       43
       +
           in

     

       44
       44
       +
           ''

     

       37
       45
        
             from contextlib import contextmanager

     

       38
       46
        
       

     

       39
       47
        
       

     
···

       97
       105
        
                 machine.screenshot("screen")

     

       98
       106
        
           '';

     

       99
       107
        
       

     

       100
       100
       -
       })

     

       108
       108
       +
       }