commit e3c1e48ef86a5774979c6961817f21c6e854e8a3 · pyrox.dev/nixpkgs

+1

nixos/lib/testing/nodes.nix

···

       16
       16
        
       

     

       17
       17
        
         baseOS =

     

       18
       18
        
           import ../eval-config.nix {

     

       19
       19
       +
             inherit lib;

     

       19
       20
        
             system = null; # use modularly defined system

     

       20
       21
        
             inherit (config.node) specialArgs;

     

       21
       22
        
             modules = [ config.defaults ];

+1

nixos/tests/all-tests.nix

···

       87
       87
        
         # Testing the test driver

     

       88
       88
        
         nixos-test-driver = {

     

       89
       89
        
           extra-python-packages = handleTest ./nixos-test-driver/extra-python-packages.nix {};

     

       90
       90
       +
           lib-extend = handleTestOn [ "x86_64-linux" "aarch64-linux" ] ./nixos-test-driver/lib-extend.nix {};

     

       90
       91
        
           node-name = runTest ./nixos-test-driver/node-name.nix;

     

       91
       92
        
         };

     

       92
       93

+31

nixos/tests/nixos-test-driver/lib-extend.nix

···

       1
       1
       +
       { pkgs, ... }:

     

       2
       2
       +
       

     

       3
       3
       +
       let

     

       4
       4
       +
         patchedPkgs = pkgs.extend (new: old: {

     

       5
       5
       +
           lib = old.lib.extend (self: super: {

     

       6
       6
       +
             sorry_dave = "sorry dave";

     

       7
       7
       +
           });

     

       8
       8
       +
         });

     

       9
       9
       +
       

     

       10
       10
       +
         testBody = {

     

       11
       11
       +
           name = "demo lib overlay";

     

       12
       12
       +
       

     

       13
       13
       +
           nodes = {

     

       14
       14
       +
             machine = { lib, ... }: {

     

       15
       15
       +
               environment.etc."got-lib-overlay".text = lib.sorry_dave;

     

       16
       16
       +
             };

     

       17
       17
       +
           };

     

       18
       18
       +
       

     

       19
       19
       +
           # We don't need to run an actual test. Instead we build the `machine` configuration

     

       20
       20
       +
           # and call it a day, because that already proves that `lib` is wired up correctly.

     

       21
       21
       +
           # See the attrset returned at the bottom of this file.

     

       22
       22
       +
           testScript = "";

     

       23
       23
       +
         };

     

       24
       24
       +
       

     

       25
       25
       +
         inherit (patchedPkgs.testers) nixosTest runNixOSTest;

     

       26
       26
       +
         evaluationNixosTest = nixosTest testBody;

     

       27
       27
       +
         evaluationRunNixOSTest = runNixOSTest testBody;

     

       28
       28
       +
       in {

     

       29
       29
       +
         nixosTest = evaluationNixosTest.driver.nodes.machine.system.build.toplevel;

     

       30
       30
       +
         runNixOSTest = evaluationRunNixOSTest.driver.nodes.machine.system.build.toplevel;

     

       31
       31
       +
       }

+3 -1

pkgs/build-support/testers/default.nix

···

       97
       97
        
         # See doc/builders/testers.chapter.md or

     

       98
       98
        
         # https://nixos.org/manual/nixpkgs/unstable/#tester-runNixOSTest

     

       99
       99
        
         runNixOSTest =

     

       100
       100
       -
           let nixos = import ../../../nixos/lib {};

     

       100
       100
       +
           let nixos = import ../../../nixos/lib {

     

       101
       101
       +
             inherit lib;

     

       102
       102
       +
           };

     

       101
       103
        
           in testModule:

     

       102
       104
        
               nixos.runTest {

     

       103
       105
        
                 _file = "pkgs.runNixOSTest implementation";