commit ca8c877f8cd1f9b84e8aa57741aa5cd60a3a2ba3 · pyrox.dev/nixpkgs

-1

nixos/tests/boot.nix

···

       38
       38
        
             } // extraConfig);

     

       39
       39
        
           in

     

       40
       40
        
             makeTest {

     

       41
       41
       -
               inherit iso;

     

       42
       41
        
               name = "boot-" + name;

     

       43
       42
        
               nodes = { };

     

       44
       43
        
               testScript =

+3 -3

nixos/tests/caddy.nix

···

       7
       7
        
         nodes = {

     

       8
       8
        
           webserver = { pkgs, lib, ... }: {

     

       9
       9
        
             services.caddy.enable = true;

     

       10
       10
       -
             services.caddy.config = ''

     

       10
       10
       +
             services.caddy.extraConfig = ''

     

       11
       11
        
               http://localhost {

     

       12
       12
        
                 encode gzip

     

       13
       13
        
       

     
···

       22
       22
        
             '';

     

       23
       23
        
       

     

       24
       24
        
             specialisation.etag.configuration = {

     

       25
       25
       -
               services.caddy.config = lib.mkForce ''

     

       25
       25
       +
               services.caddy.extraConfig = lib.mkForce ''

     

       26
       26
        
                 http://localhost {

     

       27
       27
        
                   encode gzip

     

       28
       28
        
       

     
···

       38
       38
        
             };

     

       39
       39
        
       

     

       40
       40
        
             specialisation.config-reload.configuration = {

     

       41
       41
       -
               services.caddy.config = ''

     

       41
       41
       +
               services.caddy.extraConfig = ''

     

       42
       42
        
                 http://localhost:8080 {

     

       43
       43
        
                 }

     

       44
       44
        
               '';

+1 -1

nixos/tests/ceph-multi-node.nix

···

       48
       48
        
             sudo

     

       49
       49
        
             ceph

     

       50
       50
        
             xfsprogs

     

       51
       51
       -
             netcat-openbsd

     

       51
       51
       +
             libressl.nc

     

       52
       52
        
           ];

     

       53
       53
        
       

     

       54
       54
        
           boot.kernelModules = [ "xfs" ];

+20 -18

nixos/tests/chromium.nix

···

       15
       15
        
       with import ../lib/testing-python.nix { inherit system pkgs; };

     

       16
       16
        
       with pkgs.lib;

     

       17
       17
        
       

     

       18
       18
       -
       mapAttrs (channel: chromiumPkg: makeTest rec {

     

       19
       19
       -
         name = "chromium-${channel}";

     

       20
       20
       -
         meta = {

     

       21
       21
       -
           maintainers = with maintainers; [ aszlig primeos ];

     

       22
       22
       -
           # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621

     

       23
       23
       -
           inherit (chromiumPkg.meta) timeout;

     

       24
       24
       -
         };

     

       25
       25
       -
       

     

       26
       26
       -
         enableOCR = true;

     

       27
       27
       -
       

     

       18
       18
       +
       let

     

       28
       19
        
         user = "alice";

     

       29
       29
       -
       

     

       30
       30
       -
         machine.imports = [ ./common/user-account.nix ./common/x11.nix ];

     

       31
       31
       -
         machine.virtualisation.memorySize = 2047;

     

       32
       32
       -
         machine.test-support.displayManager.auto.user = user;

     

       33
       33
       -
         machine.environment = {

     

       34
       34
       -
           systemPackages = [ chromiumPkg ];

     

       35
       35
       -
           variables."XAUTHORITY" = "/home/alice/.Xauthority";

     

       36
       36
       -
         };

     

       37
       20
        
       

     

       38
       21
        
         startupHTML = pkgs.writeText "chromium-startup.html" ''

     

       39
       22
        
           <!DOCTYPE html>

     
···

       50
       33
        
           </body>

     

       51
       34
        
           </html>

     

       52
       35
        
         '';

     

       36
       36
       +
       in

     

       37
       37
       +
       

     

       38
       38
       +
       mapAttrs (channel: chromiumPkg: makeTest {

     

       39
       39
       +
         name = "chromium-${channel}";

     

       40
       40
       +
         meta = {

     

       41
       41
       +
           maintainers = with maintainers; [ aszlig primeos ];

     

       42
       42
       +
           # https://github.com/NixOS/hydra/issues/591#issuecomment-435125621

     

       43
       43
       +
           inherit (chromiumPkg.meta) timeout;

     

       44
       44
       +
         };

     

       45
       45
       +
       

     

       46
       46
       +
         enableOCR = true;

     

       47
       47
       +
       

     

       48
       48
       +
         machine.imports = [ ./common/user-account.nix ./common/x11.nix ];

     

       49
       49
       +
         machine.virtualisation.memorySize = 2047;

     

       50
       50
       +
         machine.test-support.displayManager.auto.user = user;

     

       51
       51
       +
         machine.environment = {

     

       52
       52
       +
           systemPackages = [ chromiumPkg ];

     

       53
       53
       +
           variables."XAUTHORITY" = "/home/alice/.Xauthority";

     

       54
       54
       +
         };

     

       53
       55
        
       

     

       54
       56
        
         testScript = let

     

       55
       57
        
           xdo = name: text: let

+1 -1

nixos/tests/cri-o.nix

···

       1
       1
        
       # This test runs CRI-O and verifies via critest

     

       2
       2
        
       import ./make-test-python.nix ({ pkgs, ... }: {

     

       3
       3
        
         name = "cri-o";

     

       4
       4
       -
         maintainers = with pkgs.lib.maintainers; teams.podman.members;

     

       4
       4
       +
         meta.maintainers = with pkgs.lib.maintainers; teams.podman.members;

     

       5
       5
        
       

     

       6
       6
        
         nodes = {

     

       7
       7
        
           crio = {

+1 -1

nixos/tests/gitolite-fcgiwrap.nix

···

       20
       20
        
               nodes = {

     

       21
       21
        
       

     

       22
       22
        
                 server =

     

       23
       23
       -
                   { ... }:

     

       23
       23
       +
                   { config, ... }:

     

       24
       24
        
                     {

     

       25
       25
        
                       networking.firewall.allowedTCPPorts = [ 80 ];

     

       26
       26

+2 -2

nixos/tests/jitsi-meet.nix

···

       21
       21
        
               forceSSL = true;

     

       22
       22
        
             };

     

       23
       23
        
       

     

       24
       24
       -
             security.acme.email = "me@example.org";

     

       25
       24
        
             security.acme.acceptTerms = true;

     

       26
       26
       -
             security.acme.server = "https://example.com"; # self-signed only

     

       25
       25
       +
             security.acme.defaults.email = "me@example.org";

     

       26
       26
       +
             security.acme.defaults.server = "https://example.com"; # self-signed only

     

       27
       27
        
           };

     

       28
       28
        
         };

     

       29
       29

+3 -3

nixos/tests/misc.nix

···

       1
       1
        
       # Miscellaneous small tests that don't warrant their own VM run.

     

       2
       2
        
       

     

       3
       3
       -
       import ./make-test-python.nix ({ pkgs, ...} : rec {

     

       3
       3
       +
       import ./make-test-python.nix ({ pkgs, ...} : let

     

       4
       4
       +
         foo = pkgs.writeText "foo" "Hello World";

     

       5
       5
       +
       in {

     

       4
       6
        
         name = "misc";

     

       5
       7
        
         meta = with pkgs.lib.maintainers; {

     

       6
       8
        
           maintainers = [ eelco ];

     

       7
       9
        
         };

     

       8
       8
       -
       

     

       9
       9
       -
         foo = pkgs.writeText "foo" "Hello World";

     

       10
       10
        
       

     

       11
       11
        
         machine =

     

       12
       12
        
           { lib, ... }:

-6

nixos/tests/rstudio-server.nix

···

       14
       14
        
             };

     

       15
       15
        
           };

     

       16
       16
        
       

     

       17
       17
       -
           users.testuser = {

     

       18
       18
       -
             uid = 1000;

     

       19
       19
       -
             group = "testgroup";

     

       20
       20
       -
           };

     

       21
       21
       -
           groups.testgroup.gid = 1000;

     

       22
       22
       -
       

     

       23
       17
        
           testScript = ''

     

       24
       18
        
             machine.wait_for_unit("rstudio-server.service")

     

       25
       19
        
             machine.succeed("curl -f -vvv -s http://127.0.0.1:8787")

+2 -2

nixos/tests/step-ca.nix

···

       42
       42
        
       

     

       43
       43
        
               caclient =

     

       44
       44
        
                 { config, pkgs, ... }: {

     

       45
       45
       -
                   security.acme.server = "https://caserver:8443/acme/acme/directory";

     

       46
       46
       -
                   security.acme.email = "root@example.org";

     

       45
       45
       +
                   security.acme.defaults.server = "https://caserver:8443/acme/acme/directory";

     

       46
       46
       +
                   security.acme.defaults.email = "root@example.org";

     

       47
       47
        
                   security.acme.acceptTerms = true;

     

       48
       48
        
       

     

       49
       49
        
                   security.pki.certificateFiles = [ "${test-certificates}/root_ca.crt" ];

+10 -15

nixos/tests/tor.nix

···

       1
       1
        
       import ./make-test-python.nix ({ lib, ... }: with lib;

     

       2
       2
        
       

     

       3
       3
       -
       rec {

     

       3
       3
       +
       {

     

       4
       4
        
         name = "tor";

     

       5
       5
        
         meta.maintainers = with maintainers; [ joachifm ];

     

       6
       6
        
       

     

       7
       7
       -
         common =

     

       8
       8
       -
           { ... }:

     

       9
       9
       -
           { boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ];

     

       10
       10
       -
             networking.firewall.enable = false;

     

       11
       11
       -
             networking.useDHCP = false;

     

       12
       12
       -
           };

     

       7
       7
       +
         nodes.client = { pkgs, ... }: {

     

       8
       8
       +
           boot.kernelParams = [ "audit=0" "apparmor=0" "quiet" ];

     

       9
       9
       +
           networking.firewall.enable = false;

     

       10
       10
       +
           networking.useDHCP = false;

     

       13
       11
        
       

     

       14
       14
       -
         nodes.client =

     

       15
       15
       -
           { pkgs, ... }:

     

       16
       16
       -
           { imports = [ common ];

     

       17
       17
       -
             environment.systemPackages = with pkgs; [ netcat ];

     

       18
       18
       -
             services.tor.enable = true;

     

       19
       19
       -
             services.tor.client.enable = true;

     

       20
       20
       -
             services.tor.settings.ControlPort = 9051;

     

       21
       21
       -
           };

     

       12
       12
       +
           environment.systemPackages = with pkgs; [ netcat ];

     

       13
       13
       +
           services.tor.enable = true;

     

       14
       14
       +
           services.tor.client.enable = true;

     

       15
       15
       +
           services.tor.settings.ControlPort = 9051;

     

       16
       16
       +
         };

     

       22
       17
        
       

     

       23
       18
        
         testScript = ''

     

       24
       19
        
           client.wait_for_unit("tor.service")

-6

nixos/tests/without-nix.nix

···

       4
       4
        
           maintainers = [ ericson2314 ];

     

       5
       5
        
         };

     

       6
       6
        
       

     

       7
       7
       -
         nixpkgs.overlays = [

     

       8
       8
       -
           (self: super: {

     

       9
       9
       -
             nix = throw "don't want to use this";

     

       10
       10
       -
           })

     

       11
       11
       -
         ];

     

       12
       12
       -
       

     

       13
       7
        
         nodes.machine = { ... }: {

     

       14
       8
        
           nix.enable = false;

     

       15
       9
        
         };