Merge pull request #165035 from roberth/nixosTest-remove-machine-arg
nixosTest: remove `machine` syntax sugar
commit16c5f5534dff5fe09cf53a1f08d6d94ef5eadb19
authorRobert Hensing <roberth@users.noreply.github.com>
dateThu 31 Mar 2022, 14:41 (5 years ago)
parent73957cee2461d6
237 files changed+295−309
nixos/doc/manual/development/writing-nixos-tests.section.md+14−22
@@ -5,15 +5,9 @@ A NixOS test is a Nix expression that has the following structure:
55```nix
66import ./make-test-python.nix {
77
8− # Either the configuration of a single machine:
9− machine =
10− { config, pkgs, ... }:
11− { configuration…
12− };
13−
14− # Or a set of machines:
8+ # One or more machines:
159 nodes =
16− { machine1 =
10+ { machine =
1711 { config, pkgs, ... }: { … };
1812 machine2 =
1913 { config, pkgs, ... }: { … };
@@ -29,17 +23,16 @@ import ./make-test-python.nix {
2923
3024The attribute `testScript` is a bit of Python code that executes the
3125test (described below). During the test, it will start one or more
32−virtual machines, the configuration of which is described by the
33−attribute `machine` (if you need only one machine in your test) or by
34−the attribute `nodes` (if you need multiple machines). For instance,
35−[`login.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix)
36−only needs a single machine to test whether users can log in
26+virtual machines, the configuration of which is described by
27+the attribute `nodes`.
28+
29+An example of a single-node test is
30+[`login.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix).
31+It only needs a single machine to test whether users can log in
3732on the virtual console, whether device ownership is correctly maintained
38−when switching between consoles, and so on. On the other hand,
39−[`nfs/simple.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix),
40−which tests NFS client and server functionality in the
41−Linux kernel (including whether locks are maintained across server
42−crashes), requires three machines: a server and two clients.
33+when switching between consoles, and so on. An interesting multi-node test is
34+[`nfs/simple.nix`](https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix).
35+It uses two client nodes to test correct locking across server crashes.
4336
4437There are a few special NixOS configuration options for test VMs:
4538
@@ -67,8 +60,7 @@ The test script is a sequence of Python statements that perform various
6760actions, such as starting VMs, executing commands in the VMs, and so on.
6861Each virtual machine is represented as an object stored in the variable
6962`name` if this is also the identifier of the machine in the declarative
70−config. If you didn\'t specify multiple machines using the `nodes`
71−attribute, it is just `machine`. The following example starts the
63+config. If you specified a node `nodes.machine`, the following example starts the
7264machine, waits until it has finished booting, then executes a command
7365and checks that the output is more-or-less correct:
7466
@@ -79,7 +71,7 @@ if not "Linux" in machine.succeed("uname"):
7971 raise Exception("Wrong OS")
8072```
8173
82−The first line is actually unnecessary; machines are implicitly started
74+The first line is technically unnecessary; machines are implicitly started
8375when you first execute an action on them (such as `wait_for_unit` or
8476`succeed`). If you have multiple machines, you can speed up the test by
8577starting them in parallel:
@@ -303,7 +295,7 @@ For faster dev cycles it\'s also possible to disable the code-linters
303295```nix
304296import ./make-test-python.nix {
305297 skipLint = true;
306− machine =
298+ nodes.machine =
307299 { config, pkgs, ... }:
308300 { configuration…
309301 };
nixos/doc/manual/from_md/development/writing-nixos-tests.section.xml+18−25
@@ -6,15 +6,9 @@
66 <programlisting language="bash">
77import ./make-test-python.nix {
88
9− # Either the configuration of a single machine:
10− machine =
11− { config, pkgs, ... }:
12− { configuration…
13− };
14−
15− # Or a set of machines:
9+ # One or more machines:
1610 nodes =
17− { machine1 =
11+ { machine =
1812 { config, pkgs, ... }: { … };
1913 machine2 =
2014 { config, pkgs, ... }: { … };
@@ -31,18 +25,18 @@ import ./make-test-python.nix {
3125 The attribute <literal>testScript</literal> is a bit of Python code
3226 that executes the test (described below). During the test, it will
3327 start one or more virtual machines, the configuration of which is
34− described by the attribute <literal>machine</literal> (if you need
35− only one machine in your test) or by the attribute
36− <literal>nodes</literal> (if you need multiple machines). For
37− instance,
38− <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"><literal>login.nix</literal></link>
39− only needs a single machine to test whether users can log in on the
40− virtual console, whether device ownership is correctly maintained
41− when switching between consoles, and so on. On the other hand,
42− <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix"><literal>nfs/simple.nix</literal></link>,
43− which tests NFS client and server functionality in the Linux kernel
44− (including whether locks are maintained across server crashes),
45− requires three machines: a server and two clients.
28+ described by the attribute <literal>nodes</literal>.
29+ </para>
30+ <para>
31+ An example of a single-node test is
32+ <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/login.nix"><literal>login.nix</literal></link>.
33+ It only needs a single machine to test whether users can log in on
34+ the virtual console, whether device ownership is correctly
35+ maintained when switching between consoles, and so on. An
36+ interesting multi-node test is
37+ <link xlink:href="https://github.com/NixOS/nixpkgs/blob/master/nixos/tests/nfs/simple.nix"><literal>nfs/simple.nix</literal></link>.
38+ It uses two client nodes to test correct locking across server
39+ crashes.
4640 </para>
4741 <para>
4842 There are a few special NixOS configuration options for test VMs:
@@ -94,9 +88,8 @@ import ./make-test-python.nix {
9488 various actions, such as starting VMs, executing commands in the
9589 VMs, and so on. Each virtual machine is represented as an object
9690 stored in the variable <literal>name</literal> if this is also the
97− identifier of the machine in the declarative config. If you didn't
98− specify multiple machines using the <literal>nodes</literal>
99− attribute, it is just <literal>machine</literal>. The following
91+ identifier of the machine in the declarative config. If you
92+ specified a node <literal>nodes.machine</literal>, the following
10093 example starts the machine, waits until it has finished booting,
10194 then executes a command and checks that the output is more-or-less
10295 correct:
@@ -108,7 +101,7 @@ if not "Linux" in machine.succeed("uname"):
108101 raise Exception("Wrong OS")
109102</programlisting>
110103 <para>
111− The first line is actually unnecessary; machines are implicitly
104+ The first line is technically unnecessary; machines are implicitly
112105 started when you first execute an action on them (such as
113106 <literal>wait_for_unit</literal> or <literal>succeed</literal>). If
114107 you have multiple machines, you can speed up the test by starting
@@ -554,7 +547,7 @@ machine.wait_for_unit("xautolock.service", "x-session-user")
554547 <programlisting language="bash">
555548import ./make-test-python.nix {
556549 skipLint = true;
557− machine =
550+ nodes.machine =
558551 { config, pkgs, ... }:
559552 { configuration…
560553 };
nixos/lib/testing-python.nix+1
@@ -206,6 +206,7 @@ rec {
206206 )];
207207 };
208208 in
209+ lib.warnIf (t?machine) "In test `${name}': The `machine' attribute in NixOS tests (pkgs.nixosTest / make-test-pyton.nix / testing-python.nix / makeTest) is deprecated. Please use the equivalent `nodes.machine'."
209210 build-vms.buildVirtualNetwork (
210211 nodes // lib.optionalAttrs (machine != null) { inherit machine; }
211212 );
nixos/tests/aesmd.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with lib.maintainers; [ veehaitch ];
55 };
66
7− machine = { lib, ... }: {
7+ nodes.machine = { lib, ... }: {
88 services.aesmd = {
99 enable = true;
1010 settings = {
nixos/tests/agda.nix+1−1
@@ -15,7 +15,7 @@ in
1515 maintainers = [ alexarice turion ];
1616 };
1717
18− machine = { pkgs, ... }: {
18+ nodes.machine = { pkgs, ... }: {
1919 environment.systemPackages = [
2020 (pkgs.agda.withPackages {
2121 pkgs = p: [ p.standard-library ];
nixos/tests/airsonic.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ sumnerevans ];
55 };
66
7− machine =
7+ nodes.machine =
88 { pkgs, ... }:
99 {
1010 services.airsonic = {
nixos/tests/amazon-init-shell.nix+1−1
@@ -18,7 +18,7 @@ makeTest {
1818 meta = with maintainers; {
1919 maintainers = [ urbas ];
2020 };
21− machine = { ... }:
21+ nodes.machine = { ... }:
2222 {
2323 imports = [ ../modules/profiles/headless.nix ../modules/virtualisation/amazon-init.nix ];
2424 services.openssh.enable = true;
nixos/tests/apfs.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "apfs";
33 meta.maintainers = with pkgs.lib.maintainers; [ Luflosi ];
44
5− machine = { pkgs, ... }: {
5+ nodes.machine = { pkgs, ... }: {
66 virtualisation.emptyDiskImages = [ 1024 ];
77
88 boot.supportedFilesystems = [ "apfs" ];
nixos/tests/apparmor.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... } : {
44 maintainers = [ julm ];
55 };
66
7− machine =
7+ nodes.machine =
88 { lib, pkgs, config, ... }:
99 with lib;
1010 {
nixos/tests/atd.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
66 maintainers = [ bjornfor ];
77 };
88
9− machine =
9+ nodes.machine =
1010 { ... }:
1111 { services.atd.enable = true;
1212 users.users.alice = { isNormalUser = true; };
nixos/tests/atop.nix+6−6
@@ -107,7 +107,7 @@ in
107107{
108108 justThePackage = makeTest {
109109 name = "atop-justThePackage";
110− machine = {
110+ nodes.machine = {
111111 environment.systemPackages = [ pkgs.atop ];
112112 };
113113 testScript = with assertions; builtins.concatStringsSep "\n" [
@@ -123,7 +123,7 @@ in
123123 };
124124 defaults = makeTest {
125125 name = "atop-defaults";
126− machine = {
126+ nodes.machine = {
127127 programs.atop = {
128128 enable = true;
129129 };
@@ -141,7 +141,7 @@ in
141141 };
142142 minimal = makeTest {
143143 name = "atop-minimal";
144− machine = {
144+ nodes.machine = {
145145 programs.atop = {
146146 enable = true;
147147 atopService.enable = false;
@@ -162,7 +162,7 @@ in
162162 };
163163 netatop = makeTest {
164164 name = "atop-netatop";
165− machine = {
165+ nodes.machine = {
166166 programs.atop = {
167167 enable = true;
168168 netatop.enable = true;
@@ -181,7 +181,7 @@ in
181181 };
182182 atopgpu = makeTest {
183183 name = "atop-atopgpu";
184− machine = {
184+ nodes.machine = {
185185 nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (getName pkg) [
186186 "cudatoolkit"
187187 ];
@@ -204,7 +204,7 @@ in
204204 };
205205 everything = makeTest {
206206 name = "atop-everthing";
207− machine = {
207+ nodes.machine = {
208208 nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (getName pkg) [
209209 "cudatoolkit"
210210 ];
nixos/tests/bcachefs.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "bcachefs";
33 meta.maintainers = with pkgs.lib.maintainers; [ chiiruno ];
44
5− machine = { pkgs, ... }: {
5+ nodes.machine = { pkgs, ... }: {
66 virtualisation.emptyDiskImages = [ 4096 ];
77 networking.hostId = "deadbeef";
88 boot.supportedFilesystems = [ "bcachefs" ];
nixos/tests/beanstalkd.nix+1−1
@@ -28,7 +28,7 @@ in
2828 name = "beanstalkd";
2929 meta.maintainers = [ lib.maintainers.aanderse ];
3030
31− machine =
31+ nodes.machine =
3232 { ... }:
3333 { services.beanstalkd.enable = true;
3434 };
nixos/tests/bees.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
22{
33 name = "bees";
44
5− machine = { config, pkgs, ... }: {
5+ nodes.machine = { config, pkgs, ... }: {
66 boot.initrd.postDeviceCommands = ''
77 ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux1 /dev/vdb
88 ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux2 /dev/vdc
nixos/tests/bind.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix {
22 name = "bind";
33
4− machine = { pkgs, lib, ... }: {
4+ nodes.machine = { pkgs, lib, ... }: {
55 services.bind.enable = true;
66 services.bind.extraOptions = "empty-zones-enable no;";
77 services.bind.zones = lib.singleton {
nixos/tests/bitcoind.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = with maintainers; [ _1000101 ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 services.bitcoind."mainnet" = {
99 enable = true;
1010 rpc = {
nixos/tests/blockbook-frontend.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = with maintainers; [ _1000101 ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 services.blockbook-frontend."test" = {
99 enable = true;
1010 };
nixos/tests/boot-stage1.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "boot-stage1";
33
4− machine = { config, pkgs, lib, ... }: {
4+ nodes.machine = { config, pkgs, lib, ... }: {
55 boot.extraModulePackages = let
66 compileKernelModule = name: source: pkgs.runCommandCC name rec {
77 inherit source;
nixos/tests/boot.nix+3−3
@@ -42,7 +42,7 @@ let
4242 nodes = { };
4343 testScript =
4444 ''
45− machine = create_machine(${machineConfig})
45+ nodes.machine = create_machine(${machineConfig})
4646 machine.start()
4747 machine.wait_for_unit("multi-user.target")
4848 machine.succeed("nix store verify --no-trust -r --option experimental-features nix-command /run/current-system")
@@ -83,7 +83,7 @@ let
8383 name = "boot-netboot-" + name;
8484 nodes = { };
8585 testScript = ''
86− machine = create_machine(${machineConfig})
86+ nodes.machine = create_machine(${machineConfig})
8787 machine.start()
8888 machine.wait_for_unit("multi-user.target")
8989 machine.shutdown()
@@ -138,7 +138,7 @@ in {
138138 if os.system("qemu-img create -f qcow2 -F raw -b ${sdImage} ${mutableImage}") != 0:
139139 raise RuntimeError("Could not create mutable linked image")
140140
141− machine = create_machine(${machineConfig})
141+ nodes.machine = create_machine(${machineConfig})
142142 machine.start()
143143 machine.wait_for_unit("multi-user.target")
144144 machine.succeed("nix store verify -r --no-trust --option experimental-features nix-command /run/current-system")
nixos/tests/bpf.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "bpf";
33 meta.maintainers = with pkgs.lib.maintainers; [ martinetd ];
44
5− machine = { pkgs, ... }: {
5+ nodes.machine = { pkgs, ... }: {
66 programs.bcc.enable = true;
77 environment.systemPackages = with pkgs; [ bpftrace ];
88 };
nixos/tests/breitbandmessung.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ lib, ... }: {
22 name = "breitbandmessung";
33 meta.maintainers = with lib.maintainers; [ b4dm4n ];
44
5− machine = { pkgs, ... }: {
5+ nodes.machine = { pkgs, ... }: {
66 imports = [
77 ./common/user-account.nix
88 ./common/x11.nix
nixos/tests/brscan5.nix+1−1
@@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
77 maintainers = [ mattchrist ];
88 };
99
10− machine = { pkgs, ... }:
10+ nodes.machine = { pkgs, ... }:
1111 {
1212 nixpkgs.config.allowUnfree = true;
1313 hardware.sane = {
nixos/tests/buildkite-agents.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
66 maintainers = [ flokli ];
77 };
88
9− machine = { pkgs, ... }: {
9+ nodes.machine = { pkgs, ... }: {
1010 services.buildkite-agents = {
1111 one = {
1212 privateSshKeyPath = (import ./ssh-keys.nix pkgs).snakeOilPrivateKey;
nixos/tests/cage.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
66 maintainers = [ matthewbauer ];
77 };
88
9− machine = { ... }:
9+ nodes.machine = { ... }:
1010
1111 {
1212 imports = [ ./common/user-account.nix ];
nixos/tests/cagebreak.nix+1−1
@@ -13,7 +13,7 @@ in
1313 maintainers = [ berbiche ];
1414 };
1515
16− machine = { config, ... }:
16+ nodes.machine = { config, ... }:
1717 let
1818 alice = config.users.users.alice;
1919 in {
nixos/tests/cfssl.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "cfssl";
33
4− machine = { config, lib, pkgs, ... }:
4+ nodes.machine = { config, lib, pkgs, ... }:
55 {
66 networking.firewall.allowedTCPPorts = [ config.services.cfssl.port ];
77
nixos/tests/clickhouse.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "clickhouse";
33 meta.maintainers = with pkgs.lib.maintainers; [ ma27 ];
44
5− machine = {
5+ nodes.machine = {
66 services.clickhouse.enable = true;
77 virtualisation.memorySize = 4096;
88 };
nixos/tests/cloud-init.nix+1−1
@@ -61,7 +61,7 @@ in makeTest {
6161 meta = with pkgs.lib.maintainers; {
6262 maintainers = [ lewo ];
6363 };
64− machine = { ... }:
64+ nodes.machine = { ... }:
6565 {
6666 virtualisation.qemu.options = [ "-cdrom" "${metadataDrive}/metadata.iso" ];
6767 services.cloud-init = {
nixos/tests/cntr.nix+1−1
@@ -46,7 +46,7 @@ let
4646
4747 meta = with pkgs.lib.maintainers; { maintainers = [ sorki mic92 ]; };
4848
49− machine = { lib, ... }: {
49+ nodes.machine = { lib, ... }: {
5050 environment.systemPackages = [ pkgs.cntr ];
5151 containers.test = {
5252 autoStart = true;
nixos/tests/collectd.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "collectd";
33 meta = { };
44
5− machine =
5+ nodes.machine =
66 { pkgs, ... }:
77
88 {
nixos/tests/containers-bridge.nix+1−1
@@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
1111 maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];
1212 };
1313
14− machine =
14+ nodes.machine =
1515 { pkgs, ... }:
1616 { imports = [ ../modules/installer/cd-dvd/channel.nix ];
1717 virtualisation.writableStore = true;
nixos/tests/containers-custom-pkgs.nix+1−1
@@ -12,7 +12,7 @@ in {
1212 maintainers = with lib.maintainers; [ adisbladis earvstedt ];
1313 };
1414
15− machine = { config, ... }: {
15+ nodes.machine = { config, ... }: {
1616 assertions = let
1717 helloName = (builtins.head config.containers.test.config.system.extraDependencies).name;
1818 in [ {
nixos/tests/containers-ephemeral.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with lib.maintainers; [ patryk27 ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 virtualisation.writableStore = true;
99
1010 containers.webserver = {
nixos/tests/containers-extra_veth.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with lib.maintainers; [ kampfschlaefer ];
55 };
66
7− machine =
7+ nodes.machine =
88 { pkgs, ... }:
99 { imports = [ ../modules/installer/cd-dvd/channel.nix ];
1010 virtualisation.writableStore = true;
nixos/tests/containers-hosts.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with lib.maintainers; [ montag451 ];
55 };
66
7− machine =
7+ nodes.machine =
88 { lib, ... }:
99 {
1010 virtualisation.vlans = [];
nixos/tests/containers-imperative.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];
55 };
66
7− machine =
7+ nodes.machine =
88 { config, pkgs, lib, ... }:
99 { imports = [ ../modules/installer/cd-dvd/channel.nix ];
1010
nixos/tests/containers-ip.nix+1−1
@@ -17,7 +17,7 @@ in import ./make-test-python.nix ({ pkgs, lib, ... }: {
1717 maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ];
1818 };
1919
20− machine =
20+ nodes.machine =
2121 { pkgs, ... }: {
2222 imports = [ ../modules/installer/cd-dvd/channel.nix ];
2323 virtualisation = {
nixos/tests/containers-names.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with lib.maintainers; [ patryk27 ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 # We're using the newest kernel, so that we can test containers with long names.
99 # Please see https://github.com/NixOS/nixpkgs/issues/38509 for details.
1010 boot.kernelPackages = pkgs.linuxPackages_latest;
nixos/tests/containers-nested.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
55
66 meta = with pkgs.lib.maintainers; { maintainers = [ sorki ]; };
77
8− machine = { lib, ... }:
8+ nodes.machine = { lib, ... }:
99 let
1010 makeNested = subConf: {
1111 containers.nested = {
nixos/tests/containers-portforward.nix+1−1
@@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
1111 maintainers = with lib.maintainers; [ aristid aszlig eelco kampfschlaefer ianwookim ];
1212 };
1313
14− machine =
14+ nodes.machine =
1515 { pkgs, ... }:
1616 { imports = [ ../modules/installer/cd-dvd/channel.nix ];
1717 virtualisation.writableStore = true;
nixos/tests/containers-tmpfs.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with lib.maintainers; [ patryk27 ];
55 };
66
7− machine =
7+ nodes.machine =
88 { pkgs, ... }:
99 { imports = [ ../modules/installer/cd-dvd/channel.nix ];
1010 virtualisation.writableStore = true;
nixos/tests/custom-ca.nix+1−1
@@ -76,7 +76,7 @@ in
7676
7777 enableOCR = true;
7878
79− machine = { pkgs, ... }:
79+ nodes.machine = { pkgs, ... }:
8080 { imports = [ ./common/user-account.nix ./common/x11.nix ];
8181
8282 # chromium-based browsers refuse to run as root
nixos/tests/disable-installer-tools.nix+1−1
@@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
33{
44 name = "disable-installer-tools";
55
6− machine =
6+ nodes.machine =
77 { pkgs, lib, ... }:
88 {
99 system.disableInstallerTools = true;
nixos/tests/dnsdist.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix (
55 maintainers = with maintainers; [ jojosch ];
66 };
77
8− machine = { pkgs, lib, ... }: {
8+ nodes.machine = { pkgs, lib, ... }: {
99 services.bind = {
1010 enable = true;
1111 extraOptions = "empty-zones-enable no;";
nixos/tests/doas.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix (
66 maintainers = [ cole-h ];
77 };
88
9− machine =
9+ nodes.machine =
1010 { ... }:
1111 {
1212 users.groups = { foobar = {}; barfoo = {}; baz = { gid = 1337; }; };
nixos/tests/documize.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
44 maintainers = [ ma27 ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 environment.systemPackages = [ pkgs.jq ];
99
1010 services.documize = {
nixos/tests/domination.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ fgaz ];
55 };
66
7− machine = { config, pkgs, ... }: {
7+ nodes.machine = { config, pkgs, ... }: {
88 imports = [
99 ./common/x11.nix
1010 ];
nixos/tests/dovecot.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix {
22 name = "dovecot";
33
4− machine = { pkgs, ... }: {
4+ nodes.machine = { pkgs, ... }: {
55 imports = [ common/user-account.nix ];
66 services.postfix.enable = true;
77 services.dovecot2 = {
nixos/tests/ecryptfs.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ ... }:
22{
33 name = "ecryptfs";
44
5− machine = { pkgs, ... }: {
5+ nodes.machine = { pkgs, ... }: {
66 imports = [ ./common/user-account.nix ];
77 boot.kernelModules = [ "ecryptfs" ];
88 security.pam.enableEcryptfs = true;
nixos/tests/emacs-daemon.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
66
77 enableOCR = true;
88
9− machine =
9+ nodes.machine =
1010 { ... }:
1111
1212 { imports = [ ./common/x11.nix ];
nixos/tests/enlightenment.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
66 maintainers = [ romildo ];
77 };
88
9− machine = { ... }:
9+ nodes.machine = { ... }:
1010 {
1111 imports = [ ./common/user-account.nix ];
1212 services.xserver.enable = true;
nixos/tests/env.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ nequissimus ];
55 };
66
7− machine = { pkgs, ... }:
7+ nodes.machine = { pkgs, ... }:
88 {
99 boot.kernelPackages = pkgs.linuxPackages;
1010 environment.etc.plainFile.text = ''
nixos/tests/etebase-server.nix+1−1
@@ -9,7 +9,7 @@ in {
99 maintainers = [ felschr ];
1010 };
1111
12− machine = { pkgs, ... }:
12+ nodes.machine = { pkgs, ... }:
1313 {
1414 services.etebase-server = {
1515 inherit dataDir;
nixos/tests/etesync-dav.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
55 maintainers = [ _3699n ];
66 };
77
8− machine = { config, pkgs, ... }: {
8+ nodes.machine = { config, pkgs, ... }: {
99 environment.systemPackages = [ pkgs.curl pkgs.etesync-dav ];
1010 };
1111
nixos/tests/fancontrol.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... } : {
44 maintainers = [ evils ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 imports = [ ../modules/profiles/minimal.nix ];
99 hardware.fancontrol.enable = true;
1010 hardware.fancontrol.config = ''
nixos/tests/fcitx/default.nix+1−1
@@ -5,7 +5,7 @@ import ../make-test-python.nix (
55 # copy_from_host works only for store paths
66 rec {
77 name = "fcitx";
8− machine =
8+ nodes.machine =
99 {
1010 pkgs,
1111 ...
nixos/tests/firefox.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, firefoxPackage, ... }: {
44 maintainers = [ eelco shlevy ];
55 };
66
7− machine =
7+ nodes.machine =
88 { pkgs, ... }:
99
1010 { imports = [ ./common/x11.nix ];
nixos/tests/fish.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "fish";
33
4− machine =
4+ nodes.machine =
55 { pkgs, ... }:
66
77 {
nixos/tests/fluentd.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, lib, ... }: {
22 name = "fluentd";
33
4− machine = { pkgs, ... }: {
4+ nodes.machine = { pkgs, ... }: {
55 services.fluentd = {
66 enable = true;
77 config = ''
nixos/tests/fontconfig-default-fonts.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ lib, ... }:
66 jtojnar
77 ];
88
9− machine = { config, pkgs, ... }: {
9+ nodes.machine = { config, pkgs, ... }: {
1010 fonts.enableDefaultFonts = true; # Background fonts
1111 fonts.fonts = with pkgs; [
1212 noto-fonts-emoji
nixos/tests/fsck.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix {
22 name = "fsck";
33
4− machine = { lib, ... }: {
4+ nodes.machine = { lib, ... }: {
55 virtualisation.emptyDiskImages = [ 1 ];
66
77 virtualisation.fileSystems = {
nixos/tests/ft2-clone.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ fgaz ];
55 };
66
7− machine = { config, pkgs, ... }: {
7+ nodes.machine = { config, pkgs, ... }: {
88 imports = [
99 ./common/x11.nix
1010 ];
nixos/tests/geth.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = with maintainers; [bachp ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 services.geth."mainnet" = {
99 enable = true;
1010 http = {
nixos/tests/gnome-xorg.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
44 maintainers = teams.gnome.members;
55 };
66
7− machine = { nodes, ... }: let
7+ nodes.machine = { nodes, ... }: let
88 user = nodes.machine.config.users.users.alice;
99 in
1010
nixos/tests/gnome.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
44 maintainers = teams.gnome.members;
55 };
66
7− machine =
7+ nodes.machine =
88 { ... }:
99
1010 { imports = [ ./common/user-account.nix ];
nixos/tests/gotify-server.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
44 maintainers = [ ma27 ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 environment.systemPackages = [ pkgs.jq ];
99
1010 services.gotify = {
nixos/tests/graylog.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
22 name = "graylog";
33 meta.maintainers = with lib.maintainers; [ ];
44
5− machine = { pkgs, ... }: {
5+ nodes.machine = { pkgs, ... }: {
66 virtualisation.memorySize = 4096;
77 virtualisation.diskSize = 4096;
88
nixos/tests/grocy.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ ma27 ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 services.grocy = {
99 enable = true;
1010 hostName = "localhost";
nixos/tests/grub.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ lib, ... }: {
55 maintainers = [ rnhmjoj ];
66 };
77
8− machine = { ... }: {
8+ nodes.machine = { ... }: {
99 virtualisation.useBootLoader = true;
1010
1111 boot.loader.timeout = null;
nixos/tests/hardened.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... } : {
44 maintainers = [ joachifm ];
55 };
66
7− machine =
7+ nodes.machine =
88 { lib, pkgs, config, ... }:
99 with lib;
1010 { users.users.alice = { isNormalUser = true; extraGroups = [ "proc" ]; };
nixos/tests/herbstluftwm.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ lib, ...} : {
55 maintainers = with lib.maintainers; [ thibautmarty ];
66 };
77
8− machine = { pkgs, lib, ... }: {
8+ nodes.machine = { pkgs, lib, ... }: {
99 imports = [ ./common/x11.nix ./common/user-account.nix ];
1010 test-support.displayManager.auto.user = "alice";
1111 services.xserver.displayManager.defaultSession = lib.mkForce "none+herbstluftwm";
nixos/tests/hibernate.nix+1−1
@@ -39,7 +39,7 @@ in makeTest {
3939
4040 nodes = {
4141 # System configuration used for installing the installedConfig from above.
42− machine = { config, lib, pkgs, ... }: with lib; {
42+ nodes.machine = { config, lib, pkgs, ... }: with lib; {
4343 imports = [
4444 ../modules/profiles/installation-device.nix
4545 ../modules/profiles/base.nix
nixos/tests/hitch/default.nix+1−1
@@ -4,7 +4,7 @@ import ../make-test-python.nix ({ pkgs, ... }:
44 meta = with pkgs.lib.maintainers; {
55 maintainers = [ jflanglois ];
66 };
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 environment.systemPackages = [ pkgs.curl ];
99 services.hitch = {
1010 enable = true;
nixos/tests/hocker-fetchdocker/default.nix+1−1
@@ -5,7 +5,7 @@ import ../make-test-python.nix ({ pkgs, ...} : {
55 broken = true; # tries to download from registry-1.docker.io - how did this ever work?
66 };
77
8− machine = import ./machine.nix;
8+ nodes.machine = import ./machine.nix;
99
1010 testScript = ''
1111 start_all()
nixos/tests/hockeypuck.nix+1−1
@@ -24,7 +24,7 @@ in {
2424 name = "hockeypuck";
2525 meta.maintainers = with lib.maintainers; [ etu ];
2626
27− machine = { ... }: {
27+ nodes.machine = { ... }: {
2828 # Used for test
2929 environment.systemPackages = [ pkgs.gnupg ];
3030
nixos/tests/hostname.nix+1−1
@@ -20,7 +20,7 @@ let
2020 maintainers = [ primeos blitz ];
2121 };
2222
23− machine = { lib, ... }: {
23+ nodes.machine = { lib, ... }: {
2424 networking.hostName = hostName;
2525 networking.domain = domain;
2626
nixos/tests/hound.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... } : {
44 meta = with pkgs.lib.maintainers; {
55 maintainers = [ grahamc ];
66 };
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 services.hound = {
99 enable = true;
1010 config = ''
nixos/tests/hydra/default.nix+1−1
@@ -20,7 +20,7 @@ let
2020 maintainers = [ lewo ma27 ];
2121 };
2222
23− machine = { pkgs, lib, ... }: {
23+ nodes.machine = { pkgs, lib, ... }: {
2424 imports = [ baseConfig ];
2525 services.hydra = { inherit package; };
2626 };
nixos/tests/i3wm.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ aszlig ];
55 };
66
7− machine = { lib, ... }: {
7+ nodes.machine = { lib, ... }: {
88 imports = [ ./common/x11.nix ./common/user-account.nix ];
99 test-support.displayManager.auto.user = "alice";
1010 services.xserver.displayManager.defaultSession = lib.mkForce "none+i3";
nixos/tests/ihatemoney/default.nix+1−1
@@ -7,7 +7,7 @@ let
77 inherit (import ../../lib/testing-python.nix { inherit system pkgs; }) makeTest;
88 f = backend: makeTest {
99 name = "ihatemoney-${backend}";
10− machine = { nodes, lib, ... }: {
10+ nodes.machine = { nodes, lib, ... }: {
1111 services.ihatemoney = {
1212 enable = true;
1313 enablePublicProjectCreation = true;
nixos/tests/incron.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
44 name = "incron";
55 meta.maintainers = [ lib.maintainers.aanderse ];
66
7− machine =
7+ nodes.machine =
88 { ... }:
99 { services.incron.enable = true;
1010 services.incron.extraPackages = [ pkgs.coreutils ];
nixos/tests/initrd-network.nix+1−1
@@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
33
44 meta.maintainers = [ pkgs.lib.maintainers.eelco ];
55
6− machine = { ... }: {
6+ nodes.machine = { ... }: {
77 imports = [ ../modules/profiles/minimal.nix ];
88 boot.initrd.network.enable = true;
99 boot.initrd.network.postCommands =
nixos/tests/initrd-secrets.nix+1−1
@@ -11,7 +11,7 @@ let
1111
1212 meta.maintainers = [ lib.maintainers.lheckemann ];
1313
14− machine = { ... }: {
14+ nodes.machine = { ... }: {
1515 virtualisation.useBootLoader = true;
1616 boot.initrd.secrets = {
1717 "/test" = secretInStore;
nixos/tests/input-remapper.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
66 maintainers = with pkgs.lib.maintainers; [ LunNova ];
77 };
88
9− machine = { config, ... }:
9+ nodes.machine = { config, ... }:
1010 let user = config.users.users.sybil; in
1111 {
1212 imports = [
nixos/tests/installed-tests/default.nix+1−1
@@ -43,7 +43,7 @@ let
4343 maintainers = tested.meta.maintainers;
4444 };
4545
46− machine = { ... }: {
46+ nodes.machine = { ... }: {
4747 imports = [
4848 testConfig
4949 ] ++ optional withX11 ../common/x11.nix;
nixos/tests/invidious.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
55 maintainers = [ sbruder ];
66 };
77
8− machine = { config, lib, pkgs, ... }: {
8+ nodes.machine = { config, lib, pkgs, ... }: {
99 services.invidious = {
1010 enable = true;
1111 };
nixos/tests/isso.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ asbachb ];
55 };
66
7− machine = { config, pkgs, ... }: {
7+ nodes.machine = { config, pkgs, ... }: {
88 services.isso = {
99 enable = true;
1010 settings = {
nixos/tests/jellyfin.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
44 name = "jellyfin";
55 meta.maintainers = with lib.maintainers; [ minijackson ];
66
7− machine =
7+ nodes.machine =
88 { ... }:
99 {
1010 services.jellyfin.enable = true;
nixos/tests/jibri.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = teams.jitsi.members;
55 };
66
7− machine = { config, pkgs, ... }: {
7+ nodes.machine = { config, pkgs, ... }: {
88 virtualisation.memorySize = 5120;
99
1010 services.jitsi-meet = {
nixos/tests/k3s-single-node-docker.nix+1−1
@@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
3838 maintainers = [ euank ];
3939 };
4040
41− machine = { pkgs, ... }: {
41+ nodes.machine = { pkgs, ... }: {
4242 environment.systemPackages = with pkgs; [ k3s gzip ];
4343
4444 # k3s uses enough resources the default vm fails.
nixos/tests/k3s-single-node.nix+1−1
@@ -38,7 +38,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
3838 maintainers = [ euank ];
3939 };
4040
41− machine = { pkgs, ... }: {
41+ nodes.machine = { pkgs, ... }: {
4242 environment.systemPackages = with pkgs; [ k3s gzip ];
4343
4444 # k3s uses enough resources the default vm fails.
nixos/tests/kbd-setfont-decompress.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
44
55 meta.maintainers = with lib.maintainers; [ oxalica ];
66
7− machine = { ... }: {};
7+ nodes.machine = { ... }: {};
88
99 testScript = ''
1010 machine.succeed("gzip -cd ${pkgs.terminus_font}/share/consolefonts/ter-v16b.psf.gz >font.psf")
nixos/tests/kbd-update-search-paths-patch.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "kbd-update-search-paths-patch";
33
4− machine = { pkgs, options, ... }: {
4+ nodes.machine = { pkgs, options, ... }: {
55 console = {
66 packages = options.console.packages.default ++ [ pkgs.terminus_font ];
77 };
nixos/tests/keepassxc.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
66 maintainers = [ turion ];
77 };
88
9− machine = { ... }:
9+ nodes.machine = { ... }:
1010
1111 {
1212 imports = [
nixos/tests/kerberos/heimdal.nix+1−1
@@ -1,6 +1,6 @@
11import ../make-test-python.nix ({pkgs, ...}: {
22 name = "kerberos_server-heimdal";
3− machine = { config, libs, pkgs, ...}:
3+ nodes.machine = { config, libs, pkgs, ...}:
44 { services.kerberos_server =
55 { enable = true;
66 realms = {
nixos/tests/kerberos/mit.nix+1−1
@@ -1,6 +1,6 @@
11import ../make-test-python.nix ({pkgs, ...}: {
22 name = "kerberos_server-mit";
3− machine = { config, libs, pkgs, ...}:
3+ nodes.machine = { config, libs, pkgs, ...}:
44 { services.kerberos_server =
55 { enable = true;
66 realms = {
nixos/tests/kernel-generic.nix+1−1
@@ -12,7 +12,7 @@ let
1212 maintainers = [ nequissimus atemu ];
1313 };
1414
15− machine = { ... }:
15+ nodes.machine = { ... }:
1616 {
1717 boot.kernelPackages = linuxPackages;
1818 };
nixos/tests/kernel-latest-ath-user-regd.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ veehaitch ];
55 };
66
7− machine = { pkgs, ... }:
7+ nodes.machine = { pkgs, ... }:
88 {
99 boot.kernelPackages = pkgs.linuxPackages_latest;
1010 networking.wireless.athUserRegulatoryDomain = true;
nixos/tests/kexec.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
66 maintainers = [ eelco ];
77 };
88
9− machine = { ... }:
9+ nodes.machine = { ... }:
1010 { virtualisation.vlans = [ ]; };
1111
1212 testScript =
nixos/tests/krb5/deprecated-config.nix+1−1
@@ -7,7 +7,7 @@ import ../make-test-python.nix ({ pkgs, ...} : {
77 maintainers = [ eqyiel ];
88 };
99
10− machine =
10+ nodes.machine =
1111 { ... }: {
1212 krb5 = {
1313 enable = true;
nixos/tests/krb5/example-config.nix+1−1
@@ -7,7 +7,7 @@ import ../make-test-python.nix ({ pkgs, ...} : {
77 maintainers = [ eqyiel ];
88 };
99
10− machine =
10+ nodes.machine =
1111 { pkgs, ... }: {
1212 krb5 = {
1313 enable = true;
nixos/tests/ksm.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ lib, ...} :
66 maintainers = [ rnhmjoj ];
77 };
88
9− machine = { ... }: {
9+ nodes.machine = { ... }: {
1010 imports = [ ../modules/profiles/minimal.nix ];
1111
1212 hardware.ksm.enable = true;
nixos/tests/libinput.nix+1−1
@@ -3,7 +3,7 @@ import ./make-test-python.nix ({ ... }:
33{
44 name = "libinput";
55
6− machine = { ... }:
6+ nodes.machine = { ... }:
77 {
88 imports = [
99 ./common/x11.nix
nixos/tests/libresprite.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ fgaz ];
55 };
66
7− machine = { config, pkgs, ... }: {
7+ nodes.machine = { config, pkgs, ... }: {
88 imports = [
99 ./common/x11.nix
1010 ];
nixos/tests/lightdm.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ aszlig ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 imports = [ ./common/user-account.nix ];
99 services.xserver.enable = true;
1010 services.xserver.displayManager.lightdm.enable = true;
nixos/tests/limesurvey.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "limesurvey";
33 meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
44
5− machine = { ... }: {
5+ nodes.machine = { ... }: {
66 services.limesurvey = {
77 enable = true;
88 virtualHost = {
nixos/tests/litestream.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ jwygoda ];
55 };
66
7− machine =
7+ nodes.machine =
88 { pkgs, ... }:
99 { services.litestream = {
1010 enable = true;
nixos/tests/login.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
66 maintainers = [ eelco ];
77 };
88
9− machine =
9+ nodes.machine =
1010 { pkgs, lib, ... }:
1111 { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
1212 sound.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
nixos/tests/logrotate.nix+1−1
@@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, ...} : rec {
77 };
88
99 # default machine
10− machine = { ... }: {
10+ nodes.machine = { ... }: {
1111 };
1212
1313 testScript =
nixos/tests/loki.nix+1−1
@@ -7,7 +7,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }:
77 maintainers = [ willibutz ];
88 };
99
10− machine = { ... }: {
10+ nodes.machine = { ... }: {
1111 services.loki = {
1212 enable = true;
1313 configFile = "${pkgs.grafana-loki.src}/cmd/loki/loki-local-config.yaml";
nixos/tests/lorri/default.nix+1−1
@@ -1,5 +1,5 @@
11import ../make-test-python.nix {
2− machine = { pkgs, ... }: {
2+ nodes.machine = { pkgs, ... }: {
33 imports = [ ../../modules/profiles/minimal.nix ];
44 environment.systemPackages = [ pkgs.lorri ];
55 };
nixos/tests/lxd-image-server.nix+1−1
@@ -51,7 +51,7 @@ in {
5151 maintainers = [ mkg20001 ];
5252 };
5353
54− machine = { lib, ... }: {
54+ nodes.machine = { lib, ... }: {
5555 virtualisation = {
5656 cores = 2;
5757
nixos/tests/lxd-image.nix+1−1
@@ -44,7 +44,7 @@ in {
4444 maintainers = [ mkg20001 ];
4545 };
4646
47− machine = { lib, ... }: {
47+ nodes.machine = { lib, ... }: {
4848 virtualisation = {
4949 # disk full otherwise
5050 diskSize = 2048;
nixos/tests/lxd-nftables.nix+1−1
@@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
1212 maintainers = [ patryk27 ];
1313 };
1414
15− machine = { lib, ... }: {
15+ nodes.machine = { lib, ... }: {
1616 virtualisation = {
1717 lxd.enable = true;
1818 };
nixos/tests/lxd.nix+1−1
@@ -51,7 +51,7 @@ in {
5151 maintainers = [ patryk27 ];
5252 };
5353
54− machine = { lib, ... }: {
54+ nodes.machine = { lib, ... }: {
5555 virtualisation = {
5656 # Since we're testing `limits.cpu`, we've gotta have a known number of
5757 # cores to lean on
nixos/tests/magnetico.nix+1−1
@@ -9,7 +9,7 @@ in
99 maintainers = [ rnhmjoj ];
1010 };
1111
12− machine = { ... }: {
12+ nodes.machine = { ... }: {
1313 imports = [ ../modules/profiles/minimal.nix ];
1414
1515 networking.firewall.allowedTCPPorts = [ 9000 ];
nixos/tests/mailcatcher.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, ... }:
44 name = "mailcatcher";
55 meta.maintainers = [ lib.maintainers.aanderse ];
66
7− machine =
7+ nodes.machine =
88 { pkgs, ... }:
99 {
1010 services.mailcatcher.enable = true;
nixos/tests/mailhog.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ lib, ... }: {
22 name = "mailhog";
33 meta.maintainers = with lib.maintainers; [ jojosch ];
44
5− machine = { pkgs, ... }: {
5+ nodes.machine = { pkgs, ... }: {
66 services.mailhog.enable = true;
77
88 environment.systemPackages = with pkgs; [ swaks ];
nixos/tests/matomo.nix+1−1
@@ -7,7 +7,7 @@ with pkgs.lib;
77let
88 matomoTest = package:
99 makeTest {
10− machine = { config, pkgs, ... }: {
10+ nodes.machine = { config, pkgs, ... }: {
1111 services.matomo = {
1212 package = package;
1313 enable = true;
nixos/tests/matrix/pantalaimon.nix+1−1
@@ -36,7 +36,7 @@ import ../make-test-python.nix (
3636 maintainers = teams.matrix.members;
3737 };
3838
39− machine = { pkgs, ... }: {
39+ nodes.machine = { pkgs, ... }: {
4040 services.pantalaimon-headless.instances.${pantalaimonInstanceName} = {
4141 homeserver = "https://localhost:8448";
4242 listenAddress = "0.0.0.0";
nixos/tests/mediawiki.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
22 name = "mediawiki";
33 meta.maintainers = [ lib.maintainers.aanderse ];
44
5− machine =
5+ nodes.machine =
66 { ... }:
77 { services.mediawiki.enable = true;
88 services.mediawiki.virtualHost.hostName = "localhost";
nixos/tests/meilisearch.nix+1−1
@@ -12,7 +12,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
1212 name = "meilisearch";
1313 meta.maintainers = with lib.maintainers; [ Br1ght0ne ];
1414
15− machine = { ... }: {
15+ nodes.machine = { ... }: {
1616 environment.systemPackages = with pkgs; [ curl jq ];
1717 services.meilisearch = {
1818 enable = true;
nixos/tests/memcached.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "memcached";
33
4− machine = {
4+ nodes.machine = {
55 imports = [ ../modules/profiles/minimal.nix ];
66 services.memcached.enable = true;
77 };
nixos/tests/misc.nix+1−1
@@ -8,7 +8,7 @@ in {
88 maintainers = [ eelco ];
99 };
1010
11− machine =
11+ nodes.machine =
1212 { lib, ... }:
1313 with lib;
1414 { swapDevices = mkOverride 0
nixos/tests/mod_perl.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
55 maintainers = [ sgo ];
66 };
77
8− machine = { config, lib, pkgs, ... }: {
8+ nodes.machine = { config, lib, pkgs, ... }: {
99 services.httpd = {
1010 enable = true;
1111 adminAddr = "admin@localhost";
nixos/tests/moodle.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
22 name = "moodle";
33 meta.maintainers = [ lib.maintainers.aanderse ];
44
5− machine =
5+ nodes.machine =
66 { ... }:
77 { services.moodle.enable = true;
88 services.moodle.virtualHost.hostName = "localhost";
nixos/tests/musescore.nix+1−1
@@ -17,7 +17,7 @@ in
1717 maintainers = [ turion ];
1818 };
1919
20− machine = { ... }:
20+ nodes.machine = { ... }:
2121
2222 {
2323 imports = [
nixos/tests/mysql/mysql-autobackup.nix+1−1
@@ -17,7 +17,7 @@ let
1717 name = "${name}-automysqlbackup";
1818 meta.maintainers = [ lib.maintainers.aanderse ];
1919
20− machine = {
20+ nodes.machine = {
2121 services.mysql = {
2222 inherit package;
2323 enable = true;
nixos/tests/nagios.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix (
55 maintainers = [ symphorien ];
66 };
77
8− machine = { lib, ... }: let
8+ nodes.machine = { lib, ... }: let
99 writer = pkgs.writeShellScript "write" ''
1010 set -x
1111 echo "$@" >> /tmp/notifications
nixos/tests/navidrome.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "navidrome";
33
4− machine = { ... }: {
4+ nodes.machine = { ... }: {
55 services.navidrome.enable = true;
66 };
77
nixos/tests/networking.nix+4−4
@@ -640,7 +640,7 @@ let
640640 };
641641 virtual = {
642642 name = "Virtual";
643− machine = {
643+ nodes.machine = {
644644 networking.useNetworkd = networkd;
645645 networking.useDHCP = false;
646646 networking.interfaces.tap0 = {
@@ -784,7 +784,7 @@ let
784784 };
785785 routes = {
786786 name = "routes";
787− machine = {
787+ nodes.machine = {
788788 networking.useNetworkd = networkd;
789789 networking.useDHCP = false;
790790 networking.interfaces.eth0 = {
@@ -865,7 +865,7 @@ let
865865 };
866866 rename = {
867867 name = "RenameInterface";
868− machine = { pkgs, ... }: {
868+ nodes.machine = { pkgs, ... }: {
869869 virtualisation.vlans = [ 1 ];
870870 networking = {
871871 useNetworkd = networkd;
@@ -916,7 +916,7 @@ let
916916 testMac = "06:00:00:00:02:00";
917917 in {
918918 name = "WlanInterface";
919− machine = { pkgs, ... }: {
919+ nodes.machine = { pkgs, ... }: {
920920 boot.kernelModules = [ "mac80211_hwsim" ];
921921 networking.wlanInterfaces = {
922922 wlan0 = { device = "wlan0"; };
nixos/tests/nginx-modsecurity.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, lib, ... }: {
22 name = "nginx-modsecurity";
33
4− machine = { config, lib, pkgs, ... }: {
4+ nodes.machine = { config, lib, pkgs, ... }: {
55 services.nginx = {
66 enable = true;
77 additionalModules = [ pkgs.nginxModules.modsecurity-nginx ];
nixos/tests/nginx-pubhtml.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix {
22 name = "nginx-pubhtml";
33
4− machine = { pkgs, ... }: {
4+ nodes.machine = { pkgs, ... }: {
55 systemd.services.nginx.serviceConfig.ProtectHome = "read-only";
66 services.nginx.enable = true;
77 services.nginx.virtualHosts.localhost = {
nixos/tests/nginx-sandbox.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
66
77 # This test checks the creation and reading of a file in sandbox mode. Used simple lua script.
88
9− machine = { pkgs, ... }: {
9+ nodes.machine = { pkgs, ... }: {
1010 nixpkgs.overlays = [
1111 (self: super: {
1212 nginx-lua = super.nginx.override {
nixos/tests/nginx-sso.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = with pkgs.lib.maintainers; [ delroth ];
55 };
66
7− machine = {
7+ nodes.machine = {
88 services.nginx.sso = {
99 enable = true;
1010 configuration = {
nixos/tests/nginx-variants.nix+1−1
@@ -13,7 +13,7 @@ builtins.listToAttrs (
1313 value = makeTest {
1414 name = "nginx-variant-${nginxName}";
1515
16− machine = { pkgs, ... }: {
16+ nodes.machine = { pkgs, ... }: {
1717 services.nginx = {
1818 enable = true;
1919 virtualHosts.localhost.locations."/".return = "200 'foo'";
nixos/tests/nix-serve.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }:
22{
33 name = "nix-serve";
4− machine = { pkgs, ... }: {
4+ nodes.machine = { pkgs, ... }: {
55 services.nix-serve.enable = true;
66 environment.systemPackages = [
77 pkgs.hello
nixos/tests/nixos-generate-config.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ lib, ... } : {
22 name = "nixos-generate-config";
33 meta.maintainers = with lib.maintainers; [ basvandijk ];
4− machine = {
4+ nodes.machine = {
55 system.nixos-generate-config.configuration = ''
66 # OVERRIDDEN
77 { config, pkgs, ... }: {
nixos/tests/noto-fonts.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with lib.maintainers; [ nickcao midchildan ];
55 };
66
7− machine = {
7+ nodes.machine = {
88 imports = [ ./common/x11.nix ];
99 environment.systemPackages = [ pkgs.gnome.gedit ];
1010 fonts = {
nixos/tests/novacomd.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ dtzWill ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 services.novacomd.enable = true;
99 };
1010
nixos/tests/oh-my-zsh.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "oh-my-zsh";
33
4− machine = { pkgs, ... }:
4+ nodes.machine = { pkgs, ... }:
55
66 {
77 programs.zsh = {
nixos/tests/openldap.nix+3−3
@@ -25,7 +25,7 @@ in {
2525 inherit testScript;
2626 name = "openldap";
2727
28− machine = { pkgs, ... }: {
28+ nodes.machine = { pkgs, ... }: {
2929 environment.etc."openldap/root_password".text = "notapassword";
3030 services.openldap = {
3131 enable = true;
@@ -65,7 +65,7 @@ in {
6565 inherit testScript;
6666 name = "openldap";
6767
68− machine = { pkgs, ... }: {
68+ nodes.machine = { pkgs, ... }: {
6969 services.openldap = {
7070 enable = true;
7171 logLevel = "stats acl";
@@ -83,7 +83,7 @@ in {
8383 manualConfigDir = import ./make-test-python.nix ({ pkgs, ... }: {
8484 name = "openldap";
8585
86− machine = { pkgs, ... }: {
86+ nodes.machine = { pkgs, ... }: {
8787 services.openldap = {
8888 enable = true;
8989 configDir = "/var/db/slapd.d";
nixos/tests/opentabletdriver.nix+1−1
@@ -6,7 +6,7 @@ in {
66 maintainers = with pkgs.lib.maintainers; [ thiagokokada ];
77 };
88
9− machine = { pkgs, ... }:
9+ nodes.machine = { pkgs, ... }:
1010 {
1111 imports = [
1212 ./common/user-account.nix
nixos/tests/os-prober.nix+1−1
@@ -65,7 +65,7 @@ let
6565in {
6666 name = "os-prober";
6767
68− machine = { config, pkgs, ... }: (simpleConfig // {
68+ nodes.machine = { config, pkgs, ... }: (simpleConfig // {
6969 imports = [ ../modules/profiles/installation-device.nix
7070 ../modules/profiles/base.nix ];
7171 virtualisation.memorySize = 1300;
nixos/tests/osrm-backend.nix+1−1
@@ -5,7 +5,7 @@ in {
55 name = "osrm-backend";
66 meta.maintainers = [ lib.maintainers.erictapen ];
77
8− machine = { config, pkgs, ... }:{
8+ nodes.machine = { config, pkgs, ... }:{
99
1010 services.osrm = {
1111 enable = true;
nixos/tests/overlayfs.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "overlayfs";
33 meta.maintainers = with pkgs.lib.maintainers; [ bachp ];
44
5− machine = { pkgs, ... }: {
5+ nodes.machine = { pkgs, ... }: {
66 virtualisation.emptyDiskImages = [ 512 ];
77 networking.hostId = "deadbeef";
88 environment.systemPackages = with pkgs; [ parted ];
nixos/tests/packagekit.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ peterhoeg ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 environment.systemPackages = with pkgs; [ dbus ];
99 services.packagekit = {
1010 enable = true;
nixos/tests/pam/pam-oath-login.nix+1−1
@@ -21,7 +21,7 @@ in
2121{
2222 name = "pam-oath-login";
2323
24− machine =
24+ nodes.machine =
2525 { ... }:
2626 {
2727 security.pam.oath = {
nixos/tests/pam/pam-u2f.nix+1−1
@@ -3,7 +3,7 @@ import ../make-test-python.nix ({ ... }:
33{
44 name = "pam-u2f";
55
6− machine =
6+ nodes.machine =
77 { ... }:
88 {
99 security.pam.u2f = {
nixos/tests/pantheon.nix+1−1
@@ -7,7 +7,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} :
77 maintainers = teams.pantheon.members;
88 };
99
10− machine = { ... }:
10+ nodes.machine = { ... }:
1111
1212 {
1313 imports = [ ./common/user-account.nix ];
nixos/tests/php/fpm.nix+1−1
@@ -2,7 +2,7 @@ import ../make-test-python.nix ({ pkgs, lib, php, ... }: {
22 name = "php-${php.version}-fpm-nginx-test";
33 meta.maintainers = lib.teams.php.members;
44
5− machine = { config, lib, pkgs, ... }: {
5+ nodes.machine = { config, lib, pkgs, ... }: {
66 environment.systemPackages = [ php ];
77
88 services.nginx = {
nixos/tests/php/httpd.nix+1−1
@@ -2,7 +2,7 @@ import ../make-test-python.nix ({ pkgs, lib, php, ... }: {
22 name = "php-${php.version}-httpd-test";
33 meta.maintainers = lib.teams.php.members;
44
5− machine = { config, lib, pkgs, ... }: {
5+ nodes.machine = { config, lib, pkgs, ... }: {
66 services.httpd = {
77 enable = true;
88 adminAddr = "admin@phpfpm";
nixos/tests/php/pcre.nix+1−1
@@ -5,7 +5,7 @@ import ../make-test-python.nix ({ lib, php, ... }: {
55 name = "php-${php.version}-httpd-pcre-jit-test";
66 meta.maintainers = lib.teams.php.members;
77
8− machine = { lib, pkgs, ... }: {
8+ nodes.machine = { lib, pkgs, ... }: {
99 time.timeZone = "UTC";
1010 services.httpd = {
1111 enable = true;
nixos/tests/pict-rs.nix+1−1
@@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
33 name = "pict-rs";
44 meta.maintainers = with lib.maintainers; [ happysalada ];
55
6− machine = { ... }: {
6+ nodes.machine = { ... }: {
77 environment.systemPackages = with pkgs; [ curl jq ];
88 services.pict-rs.enable = true;
99 };
nixos/tests/plasma5-systemd-start.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
66 maintainers = [ oxalica ];
77 };
88
9− machine = { ... }:
9+ nodes.machine = { ... }:
1010
1111 {
1212 imports = [ ./common/user-account.nix ];
nixos/tests/plasma5.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} :
66 maintainers = [ ttuegel ];
77 };
88
9− machine = { ... }:
9+ nodes.machine = { ... }:
1010
1111 {
1212 imports = [ ./common/user-account.nix ];
nixos/tests/plausible.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = [ ma27 ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 virtualisation.memorySize = 4096;
99 services.plausible = {
1010 enable = true;
nixos/tests/plikd.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, ... }: {
44 maintainers = [ freezeboy ];
55 };
66
7− machine = { pkgs, ... }: let
7+ nodes.machine = { pkgs, ... }: let
88 in {
99 services.plikd.enable = true;
1010 environment.systemPackages = [ pkgs.plik ];
nixos/tests/plotinus.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = pkgs.plotinus.meta.maintainers;
55 };
66
7− machine =
7+ nodes.machine =
88 { pkgs, ... }:
99
1010 { imports = [ ./common/x11.nix ];
nixos/tests/postfix-raise-smtpd-tls-security-level.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix {
22 name = "postfix";
33
4− machine = { pkgs, ... }: {
4+ nodes.machine = { pkgs, ... }: {
55 imports = [ common/user-account.nix ];
66 services.postfix = {
77 enable = true;
nixos/tests/postfix.nix+1−1
@@ -5,7 +5,7 @@ in
55import ./make-test-python.nix {
66 name = "postfix";
77
8− machine = { pkgs, ... }: {
8+ nodes.machine = { pkgs, ... }: {
99 imports = [ common/user-account.nix ];
1010 services.postfix = {
1111 enable = true;
nixos/tests/postgresql-wal-receiver.nix+1−1
@@ -31,7 +31,7 @@ let
3131 name = "postgresql-wal-receiver-${postgresqlPackage}";
3232 meta.maintainers = with lib.maintainers; [ pacien ];
3333
34− machine = { ... }: {
34+ nodes.machine = { ... }: {
3535 services.postgresql = {
3636 package = pkg;
3737 enable = true;
nixos/tests/postgresql.nix+1−1
@@ -27,7 +27,7 @@ let
2727 maintainers = [ zagy ];
2828 };
2929
30− machine = {...}:
30+ nodes.machine = {...}:
3131 {
3232 services.postgresql = {
3333 enable = true;
nixos/tests/power-profiles-daemon.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
55 meta = with pkgs.lib.maintainers; {
66 maintainers = [ mvnetbiz ];
77 };
8− machine = { pkgs, ... }: {
8+ nodes.machine = { pkgs, ... }: {
99 services.power-profiles-daemon.enable = true;
1010 environment.systemPackages = [ pkgs.glib ];
1111 };
nixos/tests/predictable-interface-names.nix+1−1
@@ -16,7 +16,7 @@ in pkgs.lib.listToAttrs (builtins.map ({ predictable, withNetworkd }: {
1616 name = "${if predictable then "" else "un"}predictableInterfaceNames${if withNetworkd then "-with-networkd" else ""}";
1717 meta = {};
1818
19− machine = { lib, ... }: {
19+ nodes.machine = { lib, ... }: {
2020 networking.usePredictableInterfaceNames = lib.mkForce predictable;
2121 networking.useNetworkd = withNetworkd;
2222 networking.dhcpcd.enable = !withNetworkd;
nixos/tests/privacyidea.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ...} : rec {
66 maintainers = [ fpletz ];
77 };
88
9− machine = { ... }: {
9+ nodes.machine = { ... }: {
1010 virtualisation.cores = 2;
1111
1212 services.privacyidea = {
nixos/tests/privoxy.nix+1−1
@@ -33,7 +33,7 @@ in
3333 maintainers = [ rnhmjoj ];
3434 };
3535
36− machine = { ... }: {
36+ nodes.machine = { ... }: {
3737 services.nginx.enable = true;
3838 services.nginx.virtualHosts."example.com" = {
3939 addSSL = true;
nixos/tests/pt2-clone.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ fgaz ];
55 };
66
7− machine = { config, pkgs, ... }: {
7+ nodes.machine = { config, pkgs, ... }: {
88 imports = [
99 ./common/x11.nix
1010 ];
nixos/tests/pulseaudio.nix+1−1
@@ -27,7 +27,7 @@ let
2727 maintainers = [ synthetica ] ++ pkgs.pulseaudio.meta.maintainers;
2828 };
2929
30− machine = { ... }:
30+ nodes.machine = { ... }:
3131
3232 {
3333 imports = [ ./common/wayland-cage.nix ];
nixos/tests/qboot.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "qboot";
33
4− machine = { ... }: {
4+ nodes.machine = { ... }: {
55 virtualisation.bios = pkgs.qboot;
66 };
77
nixos/tests/rabbitmq.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
66 maintainers = [ eelco offline ];
77 };
88
9− machine = {
9+ nodes.machine = {
1010 services.rabbitmq = {
1111 enable = true;
1212 managementPlugin.enable = true;
nixos/tests/radicale.nix+1−1
@@ -11,7 +11,7 @@ in {
1111 name = "radicale3";
1212 meta.maintainers = with lib.maintainers; [ dotlambda ];
1313
14− machine = { pkgs, ... }: {
14+ nodes.machine = { pkgs, ... }: {
1515 services.radicale = {
1616 enable = true;
1717 settings = {
nixos/tests/rasdaemon.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... } : {
44 maintainers = [ evils ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 imports = [ ../modules/profiles/minimal.nix ];
99 hardware.rasdaemon = {
1010 enable = true;
nixos/tests/redmine.nix+1−1
@@ -9,7 +9,7 @@ with pkgs.lib;
99let
1010 redmineTest = { name, type }: makeTest {
1111 name = "redmine-${name}";
12− machine = { config, pkgs, ... }: {
12+ nodes.machine = { config, pkgs, ... }: {
1313 services.redmine = {
1414 enable = true;
1515 package = pkgs.redmine;
nixos/tests/restart-by-activation-script.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ das_j ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 imports = [ ../modules/profiles/minimal.nix ];
99
1010 systemd.services.restart-me = {
nixos/tests/retroarch.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
44 name = "retroarch";
55 meta = with pkgs.lib.maintainers; { maintainers = [ j0hax ]; };
66
7− machine = { ... }:
7+ nodes.machine = { ... }:
88
99 {
1010 imports = [ ./common/user-account.nix ];
nixos/tests/riak.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
44 maintainers = [ Br1ght0ne ];
55 };
66
7− machine = {
7+ nodes.machine = {
88 services.riak.enable = true;
99 services.riak.package = pkgs.riak;
1010 };
nixos/tests/rspamd.nix+5−5
@@ -22,7 +22,7 @@ let
2222 '';
2323 simple = name: enableIPv6: makeTest {
2424 name = "rspamd-${name}";
25− machine = {
25+ nodes.machine = {
2626 services.rspamd.enable = true;
2727 networking.enableIPv6 = enableIPv6;
2828 };
@@ -52,7 +52,7 @@ in
5252 ipv4only = simple "ipv4only" false;
5353 deprecated = makeTest {
5454 name = "rspamd-deprecated";
55− machine = {
55+ nodes.machine = {
5656 services.rspamd = {
5757 enable = true;
5858 workers.normal.bindSockets = [{
@@ -91,7 +91,7 @@ in
9191
9292 bindports = makeTest {
9393 name = "rspamd-bindports";
94− machine = {
94+ nodes.machine = {
9595 services.rspamd = {
9696 enable = true;
9797 workers.normal.bindSockets = [{
@@ -152,7 +152,7 @@ in
152152 };
153153 customLuaRules = makeTest {
154154 name = "rspamd-custom-lua-rules";
155− machine = {
155+ nodes.machine = {
156156 environment.etc."tests/no-muh.eml".text = ''
157157 From: Sheep1<bah@example.com>
158158 To: Sheep2<mah@example.com>
@@ -256,7 +256,7 @@ in
256256 };
257257 postfixIntegration = makeTest {
258258 name = "rspamd-postfix-integration";
259− machine = {
259+ nodes.machine = {
260260 environment.systemPackages = with pkgs; [ msmtp ];
261261 environment.etc."tests/gtube.eml".text = ''
262262 From: Sheep1<bah@example.com>
nixos/tests/rsyslogd.nix+2−2
@@ -11,7 +11,7 @@ with pkgs.lib;
1111 name = "rsyslogd-test1";
1212 meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
1313
14− machine = { config, pkgs, ... }: {
14+ nodes.machine = { config, pkgs, ... }: {
1515 services.rsyslogd.enable = true;
1616 services.journald.forwardToSyslog = false;
1717 };
@@ -27,7 +27,7 @@ with pkgs.lib;
2727 name = "rsyslogd-test2";
2828 meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
2929
30− machine = { config, pkgs, ... }: {
30+ nodes.machine = { config, pkgs, ... }: {
3131 services.rsyslogd.enable = true;
3232 };
3333
nixos/tests/sabnzbd.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with maintainers; [ jojosch ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 services.sabnzbd = {
99 enable = true;
1010 };
nixos/tests/sddm.nix+2−2
@@ -12,7 +12,7 @@ let
1212 default = {
1313 name = "sddm";
1414
15− machine = { ... }: {
15+ nodes.machine = { ... }: {
1616 imports = [ ./common/user-account.nix ];
1717 services.xserver.enable = true;
1818 services.xserver.displayManager.sddm.enable = true;
@@ -41,7 +41,7 @@ let
4141 maintainers = [ ttuegel ];
4242 };
4343
44− machine = { ... }: {
44+ nodes.machine = { ... }: {
4545 imports = [ ./common/user-account.nix ];
4646 services.xserver.enable = true;
4747 services.xserver.displayManager = {
nixos/tests/shattered-pixel-dungeon.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ fgaz ];
55 };
66
7− machine = { config, pkgs, ... }: {
7+ nodes.machine = { config, pkgs, ... }: {
88 imports = [
99 ./common/x11.nix
1010 ];
nixos/tests/shiori.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}:
44 name = "shiori";
55 meta.maintainers = with lib.maintainers; [ minijackson ];
66
7− machine =
7+ nodes.machine =
88 { ... }:
99 { services.shiori.enable = true; };
1010
nixos/tests/signal-desktop.nix+1−1
@@ -16,7 +16,7 @@ in {
1616 maintainers = [ flokli primeos ];
1717 };
1818
19− machine = { ... }:
19+ nodes.machine = { ... }:
2020
2121 {
2222 imports = [
nixos/tests/simple.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ eelco ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 imports = [ ../modules/profiles/minimal.nix ];
99 };
1010
nixos/tests/snapper.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ ... }:
22{
33 name = "snapper";
44
5− machine = { pkgs, lib, ... }: {
5+ nodes.machine = { pkgs, lib, ... }: {
66 boot.initrd.postDeviceCommands = ''
77 ${pkgs.btrfs-progs}/bin/mkfs.btrfs -f -L aux /dev/vdb
88 '';
nixos/tests/soapui.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ asbachb ];
55 };
66
7− machine = { config, pkgs, ... }: {
7+ nodes.machine = { config, pkgs, ... }: {
88 imports = [
99 ./common/x11.nix
1010 ];
nixos/tests/solr.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
44 name = "solr";
55 meta.maintainers = [ pkgs.lib.maintainers.aanderse ];
66
7− machine =
7+ nodes.machine =
88 { config, pkgs, ... }:
99 {
1010 # Ensure the virtual machine has enough memory for Solr to avoid the following error:
nixos/tests/sourcehut.nix+1−1
@@ -119,7 +119,7 @@ in
119119
120120 meta.maintainers = [ pkgs.lib.maintainers.tomberek ];
121121
122− machine = { config, pkgs, nodes, ... }: {
122+ nodes.machine = { config, pkgs, nodes, ... }: {
123123 # buildsrht needs space
124124 virtualisation.diskSize = 4 * 1024;
125125 virtualisation.memorySize = 2 * 1024;
nixos/tests/sssd-ldap.nix+1−1
@@ -13,7 +13,7 @@ in import ./make-test-python.nix ({pkgs, ...}: {
1313 maintainers = [ bbigras ];
1414 };
1515
16− machine = { pkgs, ... }: {
16+ nodes.machine = { pkgs, ... }: {
1717 services.openldap = {
1818 enable = true;
1919 settings = {
nixos/tests/sssd.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
55 meta = with pkgs.lib.maintainers; {
66 maintainers = [ bbigras ];
77 };
8− machine = { pkgs, ... }: {
8+ nodes.machine = { pkgs, ... }: {
99 services.sssd.enable = true;
1010 };
1111
nixos/tests/starship.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "starship";
33 meta.maintainers = pkgs.starship.meta.maintainers;
44
5− machine = {
5+ nodes.machine = {
66 programs = {
77 fish.enable = true;
88 zsh.enable = true;
nixos/tests/sway.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with lib.maintainers; [ primeos synthetica ];
55 };
66
7− machine = { config, ... }: {
7+ nodes.machine = { config, ... }: {
88 # Automatically login on tty1 as a normal user:
99 imports = [ ./common/user-account.nix ];
1010 services.getty.autologinUser = "alice";
nixos/tests/sympa.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
22 name = "sympa";
33 meta.maintainers = with lib.maintainers; [ mmilata ];
44
5− machine =
5+ nodes.machine =
66 { ... }:
77 {
88
nixos/tests/syncthing-init.nix+1−1
@@ -6,7 +6,7 @@ in {
66 name = "syncthing-init";
77 meta.maintainers = with pkgs.lib.maintainers; [ lassulus ];
88
9− machine = {
9+ nodes.machine = {
1010 services.syncthing = {
1111 enable = true;
1212 devices.testDevice = {
nixos/tests/syncthing-relay.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
22 name = "syncthing-relay";
33 meta.maintainers = with pkgs.lib.maintainers; [ delroth ];
44
5− machine = {
5+ nodes.machine = {
66 environment.systemPackages = [ pkgs.jq ];
77 services.syncthing.relay = {
88 enable = true;
nixos/tests/systemd-analyze.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, latestKernel ? false, ... }:
66 maintainers = [ raskin ];
77 };
88
9− machine =
9+ nodes.machine =
1010 { pkgs, lib, ... }:
1111 { boot.kernelPackages = lib.mkIf latestKernel pkgs.linuxPackages_latest;
1212 sound.enable = true; # needed for the factl test, /dev/snd/* exists without them but udev doesn't care then
nixos/tests/systemd-binfmt.nix+3−3
@@ -31,7 +31,7 @@ let
3131in {
3232 basic = makeTest {
3333 name = "systemd-binfmt";
34− machine = {
34+ nodes.machine = {
3535 boot.binfmt.emulatedSystems = [
3636 "armv7l-linux"
3737 "aarch64-linux"
@@ -56,7 +56,7 @@ in {
5656
5757 preserveArgvZero = makeTest {
5858 name = "systemd-binfmt-preserve-argv0";
59− machine = {
59+ nodes.machine = {
6060 boot.binfmt.emulatedSystems = [
6161 "aarch64-linux"
6262 ];
@@ -71,7 +71,7 @@ in {
7171
7272 ldPreload = makeTest {
7373 name = "systemd-binfmt-ld-preload";
74− machine = {
74+ nodes.machine = {
7575 boot.binfmt.emulatedSystems = [
7676 "aarch64-linux"
7777 ];
nixos/tests/systemd-boot.nix+9−9
@@ -20,7 +20,7 @@ in
2020 name = "systemd-boot";
2121 meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
2222
23− machine = common;
23+ nodes.machine = common;
2424
2525 testScript = ''
2626 machine.start()
@@ -44,7 +44,7 @@ in
4444 name = "systemd-boot-specialisation";
4545 meta.maintainers = with pkgs.lib.maintainers; [ lukegb ];
4646
47− machine = { pkgs, lib, ... }: {
47+ nodes.machine = { pkgs, lib, ... }: {
4848 imports = [ common ];
4949 specialisation.something.configuration = {};
5050 };
@@ -67,7 +67,7 @@ in
6767 name = "systemd-boot-fallback";
6868 meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
6969
70− machine = { pkgs, lib, ... }: {
70+ nodes.machine = { pkgs, lib, ... }: {
7171 imports = [ common ];
7272 boot.loader.efi.canTouchEfiVariables = mkForce false;
7373 };
@@ -93,7 +93,7 @@ in
9393 name = "systemd-boot-update";
9494 meta.maintainers = with pkgs.lib.maintainers; [ danielfullmer ];
9595
96− machine = common;
96+ nodes.machine = common;
9797
9898 testScript = ''
9999 machine.succeed("mount -o remount,rw /boot")
@@ -115,7 +115,7 @@ in
115115 name = "systemd-boot-memtest86";
116116 meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
117117
118− machine = { pkgs, lib, ... }: {
118+ nodes.machine = { pkgs, lib, ... }: {
119119 imports = [ common ];
120120 boot.loader.systemd-boot.memtest86.enable = true;
121121 nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
@@ -133,7 +133,7 @@ in
133133 name = "systemd-boot-netbootxyz";
134134 meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
135135
136− machine = { pkgs, lib, ... }: {
136+ nodes.machine = { pkgs, lib, ... }: {
137137 imports = [ common ];
138138 boot.loader.systemd-boot.netbootxyz.enable = true;
139139 };
@@ -148,7 +148,7 @@ in
148148 name = "systemd-boot-entry-filename";
149149 meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
150150
151− machine = { pkgs, lib, ... }: {
151+ nodes.machine = { pkgs, lib, ... }: {
152152 imports = [ common ];
153153 boot.loader.systemd-boot.memtest86.enable = true;
154154 boot.loader.systemd-boot.memtest86.entryFilename = "apple.conf";
@@ -168,7 +168,7 @@ in
168168 name = "systemd-boot-extra-entries";
169169 meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
170170
171− machine = { pkgs, lib, ... }: {
171+ nodes.machine = { pkgs, lib, ... }: {
172172 imports = [ common ];
173173 boot.loader.systemd-boot.extraEntries = {
174174 "banana.conf" = ''
@@ -187,7 +187,7 @@ in
187187 name = "systemd-boot-extra-files";
188188 meta.maintainers = with pkgs.lib.maintainers; [ Enzime ];
189189
190− machine = { pkgs, lib, ... }: {
190+ nodes.machine = { pkgs, lib, ... }: {
191191 imports = [ common ];
192192 boot.loader.systemd-boot.extraFiles = {
193193 "efi/fruits/tomato.efi" = pkgs.netbootxyz-efi;
nixos/tests/systemd-confinement.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix {
22 name = "systemd-confinement";
33
4− machine = { pkgs, lib, ... }: let
4+ nodes.machine = { pkgs, lib, ... }: let
55 testServer = pkgs.writeScript "testserver.sh" ''
66 #!${pkgs.runtimeShell}
77 export PATH=${lib.escapeShellArg "${pkgs.coreutils}/bin"}
nixos/tests/systemd-cryptenroll.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ ymatsiuk ];
55 };
66
7− machine = { pkgs, lib, ... }: {
7+ nodes.machine = { pkgs, lib, ... }: {
88 environment.systemPackages = [ pkgs.cryptsetup ];
99 virtualisation = {
1010 emptyDiskImages = [ 512 ];
nixos/tests/systemd-escaping.nix+1−1
@@ -14,7 +14,7 @@ in
1414{
1515 name = "systemd-escaping";
1616
17− machine = { pkgs, lib, utils, ... }: {
17+ nodes.machine = { pkgs, lib, utils, ... }: {
1818 systemd.services.echo =
1919 assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ [] ])).success;
2020 assert !(builtins.tryEval (utils.escapeSystemdExecArgs [ {} ])).success;
nixos/tests/systemd-journal.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
66 maintainers = [ lewo ];
77 };
88
9− machine = { pkgs, lib, ... }: {
9+ nodes.machine = { pkgs, lib, ... }: {
1010 services.journald.enableHttpGateway = true;
1111 };
1212
nixos/tests/systemd-machinectl.nix+1−1
@@ -28,7 +28,7 @@ import ./make-test-python.nix (
2828 {
2929 name = "systemd-machinectl";
3030
31− machine = { lib, ... }: {
31+ nodes.machine = { lib, ... }: {
3232 # use networkd to obtain systemd network setup
3333 networking.useNetworkd = true;
3434 networking.useDHCP = false;
nixos/tests/systemd-misc.nix+1−1
@@ -31,7 +31,7 @@ in
3131{
3232 name = "systemd-misc";
3333
34− machine = { pkgs, lib, ... }: {
34+ nodes.machine = { pkgs, lib, ... }: {
3535 boot.extraSystemdUnitPaths = [ "/etc/systemd-rw/system" ];
3636
3737 users.users.limited = {
nixos/tests/systemd.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ... }: {
22 name = "systemd";
33
4− machine = { lib, ... }: {
4+ nodes.machine = { lib, ... }: {
55 imports = [ common/user-account.nix common/x11.nix ];
66
77 virtualisation.emptyDiskImages = [ 512 512 ];
nixos/tests/telegraf.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ mic92 ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 services.telegraf.enable = true;
99 services.telegraf.environmentFiles = [(pkgs.writeText "secrets" ''
1010 SECRET=example
nixos/tests/tinywl.nix+1−1
@@ -6,7 +6,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }:
66 maintainers = with lib.maintainers; [ primeos ];
77 };
88
9− machine = { config, ... }: {
9+ nodes.machine = { config, ... }: {
1010 # Automatically login on tty1 as a normal user:
1111 imports = [ ./common/user-account.nix ];
1212 services.getty.autologinUser = "alice";
nixos/tests/tomcat.nix+1−1
@@ -3,7 +3,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
33{
44 name = "tomcat";
55
6− machine = { pkgs, ... }: {
6+ nodes.machine = { pkgs, ... }: {
77 services.tomcat.enable = true;
88 };
99
nixos/tests/transmission.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ coconnor ];
55 };
66
7− machine = { ... }: {
7+ nodes.machine = { ... }: {
88 imports = [ ../modules/profiles/minimal.nix ];
99
1010 networking.firewall.allowedTCPPorts = [ 9091 ];
nixos/tests/tsm-client-gui.nix+1−1
@@ -10,7 +10,7 @@ import ./make-test-python.nix ({ lib, pkgs, ... }: {
1010
1111 enableOCR = true;
1212
13− machine = { pkgs, ... }: {
13+ nodes.machine = { pkgs, ... }: {
1414 imports = [ ./common/x11.nix ];
1515 programs.tsmClient = {
1616 enable = true;
nixos/tests/tuptime.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ evils ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 imports = [ ../modules/profiles/minimal.nix ];
99 services.tuptime.enable = true;
1010 };
nixos/tests/turbovnc-headless-server.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ... }: {
44 maintainers = with lib.maintainers; [ nh2 ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88
99 environment.systemPackages = with pkgs; [
1010 glxinfo
nixos/tests/tuxguitar.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ asbachb ];
55 };
66
7− machine = { config, pkgs, ... }: {
7+ nodes.machine = { config, pkgs, ... }: {
88 imports = [
99 ./common/x11.nix
1010 ];
nixos/tests/udisks2.nix+1−1
@@ -15,7 +15,7 @@ in
1515 maintainers = [ eelco ];
1616 };
1717
18− machine =
18+ nodes.machine =
1919 { ... }:
2020 { services.udisks2.enable = true;
2121 imports = [ ./common/user-account.nix ];
nixos/tests/usbguard.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ tnias ];
55 };
66
7− machine =
7+ nodes.machine =
88 { ... }:
99 {
1010 services.usbguard = {
nixos/tests/user-activation-scripts.nix+1−1
@@ -2,7 +2,7 @@ import ./make-test-python.nix ({ lib, ... }: {
22 name = "user-activation-scripts";
33 meta = with lib.maintainers; { maintainers = [ chkno ]; };
44
5− machine = {
5+ nodes.machine = {
66 system.userActivationScripts.foo = "mktemp ~/user-activation-ran.XXXXXX";
77 users.users.alice = {
88 initialPassword = "pass1";
nixos/tests/uwsgi.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
55 maintainers = [ lnl7 ];
66 };
77
8− machine = { pkgs, ... }: {
8+ nodes.machine = { pkgs, ... }: {
99 users.users.hello =
1010 { isSystemUser = true;
1111 group = "hello";
nixos/tests/v2ray.nix+1−1
@@ -57,7 +57,7 @@ in {
5757 meta = with lib.maintainers; {
5858 maintainers = [ servalcatty ];
5959 };
60− machine = { pkgs, ... }: {
60+ nodes.machine = { pkgs, ... }: {
6161 environment.systemPackages = [ pkgs.curl ];
6262 services.v2ray = {
6363 enable = true;
nixos/tests/vault-postgresql.nix+1−1
@@ -11,7 +11,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
1111 meta = with pkgs.lib.maintainers; {
1212 maintainers = [ lnl7 roberth ];
1313 };
14− machine = { lib, pkgs, ... }: {
14+ nodes.machine = { lib, pkgs, ... }: {
1515 environment.systemPackages = [ pkgs.vault ];
1616 environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
1717 services.vault.enable = true;
nixos/tests/vault.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }:
44 meta = with pkgs.lib.maintainers; {
55 maintainers = [ lnl7 ];
66 };
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 environment.systemPackages = [ pkgs.vault ];
99 environment.variables.VAULT_ADDR = "http://127.0.0.1:8200";
1010 services.vault.enable = true;
nixos/tests/vector.nix+1−1
@@ -9,7 +9,7 @@ with pkgs.lib;
99 name = "vector-test1";
1010 meta.maintainers = [ pkgs.lib.maintainers.happysalada ];
1111
12− machine = { config, pkgs, ... }: {
12+ nodes.machine = { config, pkgs, ... }: {
1313 services.vector = {
1414 enable = true;
1515 journaldAccess = true;
nixos/tests/vengi-tools.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ... }: {
44 maintainers = [ fgaz ];
55 };
66
7− machine = { config, pkgs, ... }: {
7+ nodes.machine = { config, pkgs, ... }: {
88 imports = [
99 ./common/x11.nix
1010 ];
nixos/tests/virtualbox.nix+1−1
@@ -353,7 +353,7 @@ let
353353 mkVBoxTest = useExtensionPack: vms: name: testScript: makeTest {
354354 name = "virtualbox-${name}";
355355
356− machine = { lib, config, ... }: {
356+ nodes.machine = { lib, config, ... }: {
357357 imports = let
358358 mkVMConf = name: val: val.machine // { key = "${name}-config"; };
359359 vmConfigs = mapAttrsToList mkVMConf vms;
nixos/tests/web-servers/unit-php.nix+1−1
@@ -6,7 +6,7 @@ in {
66 name = "unit-php-test";
77 meta.maintainers = with pkgs.lib.maintainers; [ izorkin ];
88
9− machine = { config, lib, pkgs, ... }: {
9+ nodes.machine = { config, lib, pkgs, ... }: {
1010 services.unit = {
1111 enable = true;
1212 config = pkgs.lib.strings.toJSON {
nixos/tests/wiki-js.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...} : {
44 maintainers = [ ma27 ];
55 };
66
7− machine = { pkgs, ... }: {
7+ nodes.machine = { pkgs, ... }: {
88 virtualisation.memorySize = 2048;
99 services.wiki-js = {
1010 enable = true;
nixos/tests/wine.nix+1−1
@@ -15,7 +15,7 @@ let
1515 inherit name;
1616 meta = with pkgs.lib.maintainers; { maintainers = [ chkno ]; };
1717
18− machine = { pkgs, ... }: {
18+ nodes.machine = { pkgs, ... }: {
1919 environment.systemPackages = [ pkgs."${packageSet}"."${variant}" ];
2020 virtualisation.diskSize = 800;
2121 };
nixos/tests/wmderland.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ takagiy ];
55 };
66
7− machine = { lib, ... }: {
7+ nodes.machine = { lib, ... }: {
88 imports = [ ./common/x11.nix ./common/user-account.nix ];
99 test-support.displayManager.auto.user = "alice";
1010 services.xserver.displayManager.defaultSession = lib.mkForce "none+wmderland";
nixos/tests/wpa_supplicant.nix+1−1
@@ -5,7 +5,7 @@ import ./make-test-python.nix ({ pkgs, lib, ...}:
55 maintainers = [ rnhmjoj ];
66 };
77
8− machine = { ... }: {
8+ nodes.machine = { ... }: {
99 imports = [ ../modules/profiles/minimal.nix ];
1010
1111 # add a virtual wlan interface
nixos/tests/xfce.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, ...} : {
22 name = "xfce";
33
4− machine =
4+ nodes.machine =
55 { pkgs, ... }:
66
77 {
nixos/tests/xmonad.nix+1−1
@@ -55,7 +55,7 @@ in {
5555 maintainers = [ nequissimus ivanbrennan ];
5656 };
5757
58− machine = { pkgs, ... }: {
58+ nodes.machine = { pkgs, ... }: {
5959 imports = [ ./common/x11.nix ./common/user-account.nix ];
6060 test-support.displayManager.auto.user = "alice";
6161 services.xserver.displayManager.defaultSession = "none+xmonad";
nixos/tests/xterm.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ pkgs, ...} : {
44 maintainers = [ nequissimus ];
55 };
66
7− machine = { pkgs, ... }:
7+ nodes.machine = { pkgs, ... }:
88 {
99 imports = [ ./common/x11.nix ];
1010 services.xserver.desktopManager.xterm.enable = false;
nixos/tests/yabar.nix+1−1
@@ -8,7 +8,7 @@ with lib;
88 maintainers = [ ];
99 };
1010
11− machine = {
11+ nodes.machine = {
1212 imports = [ ./common/x11.nix ./common/user-account.nix ];
1313
1414 test-support.displayManager.auto.user = "bob";
nixos/tests/zfs.nix+1−1
@@ -18,7 +18,7 @@ let
1818 maintainers = [ adisbladis ];
1919 };
2020
21− machine = { pkgs, lib, ... }:
21+ nodes.machine = { pkgs, lib, ... }:
2222 let
2323 usersharePath = "/var/lib/samba/usershares";
2424 in {
nixos/tests/zigbee2mqtt.nix+1−1
@@ -1,7 +1,7 @@
11import ./make-test-python.nix ({ pkgs, lib, ... }:
22
33 {
4− machine = { pkgs, ... }:
4+ nodes.machine = { pkgs, ... }:
55 {
66 services.zigbee2mqtt = {
77 enable = true;
nixos/tests/zoneminder.nix+1−1
@@ -4,7 +4,7 @@ import ./make-test-python.nix ({ lib, ...}:
44 name = "zoneminder";
55 meta.maintainers = with lib.maintainers; [ danielfullmer ];
66
7− machine = { ... }:
7+ nodes.machine = { ... }:
88 {
99 services.zoneminder = {
1010 enable = true;
pkgs/test/nixos-functions/default.nix+1−1
@@ -28,7 +28,7 @@ in lib.optionalAttrs stdenv.hostPlatform.isLinux (
2828
2929 nixosTest-test = pkgs.nixosTest ({ lib, pkgs, figlet, ... }: {
3030 name = "nixosTest-test";
31− machine = { pkgs, ... }: {
31+ nodes.machine = { pkgs, ... }: {
3232 system.nixos = dummyVersioning;
3333 environment.systemPackages = [ pkgs.hello figlet ];
3434 };