diff --git a/nixos/tests/discourse.nix b/nixos/tests/discourse.nix index 20c1e09f10c2..33b02a3ffe2a 100644 --- a/nixos/tests/discourse.nix +++ b/nixos/tests/discourse.nix @@ -165,7 +165,7 @@ in }; testScript = - { nodes }: + { nodes, ... }: let request = builtins.toJSON { title = "Private message"; diff --git a/nixos/tests/drbd.nix b/nixos/tests/drbd.nix index fb88362b10a2..6f31fbce3da5 100644 --- a/nixos/tests/drbd.nix +++ b/nixos/tests/drbd.nix @@ -54,38 +54,36 @@ in nodes.drbd1 = drbdConfig; nodes.drbd2 = drbdConfig; - testScript = - { nodes }: - '' - drbd1.start() - drbd2.start() + testScript = '' + drbd1.start() + drbd2.start() - drbd1.wait_for_unit("network.target") - drbd2.wait_for_unit("network.target") + drbd1.wait_for_unit("network.target") + drbd2.wait_for_unit("network.target") - drbd1.succeed( - "drbdadm create-md r0", - "drbdadm up r0", - "drbdadm primary r0 --force", - ) + drbd1.succeed( + "drbdadm create-md r0", + "drbdadm up r0", + "drbdadm primary r0 --force", + ) - drbd2.succeed("drbdadm create-md r0", "drbdadm up r0") + drbd2.succeed("drbdadm create-md r0", "drbdadm up r0") - drbd1.succeed( - "mkfs.ext4 /dev/drbd0", - "mkdir -p /mnt/drbd", - "mount /dev/drbd0 /mnt/drbd", - "touch /mnt/drbd/hello", - "umount /mnt/drbd", - "drbdadm secondary r0", - ) - drbd1.sleep(1) + drbd1.succeed( + "mkfs.ext4 /dev/drbd0", + "mkdir -p /mnt/drbd", + "mount /dev/drbd0 /mnt/drbd", + "touch /mnt/drbd/hello", + "umount /mnt/drbd", + "drbdadm secondary r0", + ) + drbd1.sleep(1) - drbd2.succeed( - "drbdadm primary r0", - "mkdir -p /mnt/drbd", - "mount /dev/drbd0 /mnt/drbd", - "ls /mnt/drbd/hello", - ) - ''; + drbd2.succeed( + "drbdadm primary r0", + "mkdir -p /mnt/drbd", + "mount /dev/drbd0 /mnt/drbd", + "ls /mnt/drbd/hello", + ) + ''; } diff --git a/nixos/tests/munge.nix b/nixos/tests/munge.nix index 38c47224b959..6c21e5221e6a 100644 --- a/nixos/tests/munge.nix +++ b/nixos/tests/munge.nix @@ -12,7 +12,7 @@ }; testScript = - { nodes }: + { nodes, ... }: let aliceUid = toString nodes.machine.users.users.alice.uid; in diff --git a/nixos/tests/nixops/default.nix b/nixos/tests/nixops/default.nix index 13b9d9dfbe07..8e46ccd7f9d8 100644 --- a/nixos/tests/nixops/default.nix +++ b/nixos/tests/nixops/default.nix @@ -57,7 +57,7 @@ let }; testScript = - { nodes }: + { nodes, ... }: let deployerSetup = pkgs.writeScript "deployerSetup" '' #!${pkgs.runtimeShell} diff --git a/nixos/tests/parsedmarc/default.nix b/nixos/tests/parsedmarc/default.nix index 571fe1d5f75f..6018e2eef172 100644 --- a/nixos/tests/parsedmarc/default.nix +++ b/nixos/tests/parsedmarc/default.nix @@ -91,7 +91,7 @@ in }; testScript = - { nodes }: + { nodes, ... }: let esPort = toString nodes.parsedmarc.config.services.elasticsearch.port; valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value"; @@ -202,7 +202,7 @@ in }; testScript = - { nodes }: + { nodes, ... }: let esPort = toString nodes.parsedmarc.config.services.elasticsearch.port; valueObject = lib.optionalString (lib.versionAtLeast nodes.parsedmarc.config.services.elasticsearch.package.version "7") ".value"; diff --git a/nixos/tests/rspamd-trainer.nix b/nixos/tests/rspamd-trainer.nix index 2f58ab73dd4f..f04b8475e8b4 100644 --- a/nixos/tests/rspamd-trainer.nix +++ b/nixos/tests/rspamd-trainer.nix @@ -136,31 +136,29 @@ in }; - testScript = - { nodes }: - '' - start_all() - machine.wait_for_unit("maddy.service") - machine.wait_for_open_port(143) - machine.wait_for_open_port(993) - machine.wait_for_open_port(587) - machine.wait_for_open_port(465) + testScript = '' + start_all() + machine.wait_for_unit("maddy.service") + machine.wait_for_open_port(143) + machine.wait_for_open_port(993) + machine.wait_for_open_port(587) + machine.wait_for_open_port(465) - # Send test mail to spam@domain - machine.succeed("send-testmail") + # Send test mail to spam@domain + machine.succeed("send-testmail") - # Create mail directories required for rspamd-trainer and copy mail from - # INBOX into INBOX/report_ham - machine.succeed("create-mail-dirs") + # Create mail directories required for rspamd-trainer and copy mail from + # INBOX into INBOX/report_ham + machine.succeed("create-mail-dirs") - # Start rspamd-trainer. It should read mail from INBOX/report_ham - machine.wait_for_unit("rspamd.service") - machine.wait_for_unit("redis-rspamd.service") - machine.wait_for_file("/run/rspamd/rspamd.sock") - machine.succeed("systemctl start rspamd-trainer.service") + # Start rspamd-trainer. It should read mail from INBOX/report_ham + machine.wait_for_unit("rspamd.service") + machine.wait_for_unit("redis-rspamd.service") + machine.wait_for_file("/run/rspamd/rspamd.sock") + machine.succeed("systemctl start rspamd-trainer.service") - # Check if mail got processed by rspamd-trainer successfully and check for - # it in INBOX/learned_ham - machine.succeed("test-imap") - ''; + # Check if mail got processed by rspamd-trainer successfully and check for + # it in INBOX/learned_ham + machine.succeed("test-imap") + ''; } diff --git a/nixos/tests/spire.nix b/nixos/tests/spire.nix index 52120558a264..e23732faa099 100644 --- a/nixos/tests/spire.nix +++ b/nixos/tests/spire.nix @@ -59,7 +59,7 @@ in }; testScript = - { nodes }: + { nodes, ... }: let adminSocket = nodes.server.services.spire.server.settings.server.socket_path; workloadSocket = nodes.agent.services.spire.agent.settings.agent.socket_path; diff --git a/nixos/tests/web-apps/peering-manager.nix b/nixos/tests/web-apps/peering-manager.nix index 34ea331edb49..e18a08d95b0d 100644 --- a/nixos/tests/web-apps/peering-manager.nix +++ b/nixos/tests/web-apps/peering-manager.nix @@ -18,7 +18,7 @@ }; testScript = - { nodes }: + { nodes, ... }: '' machine.start() machine.wait_for_unit("peering-manager.target") diff --git a/nixos/tests/web-apps/snipe-it.nix b/nixos/tests/web-apps/snipe-it.nix index 2f5764cd33be..345edd881de9 100644 --- a/nixos/tests/web-apps/snipe-it.nix +++ b/nixos/tests/web-apps/snipe-it.nix @@ -44,7 +44,7 @@ in }; testScript = - { nodes }: + { nodes, ... }: let backupPath = "${nodes.snipeit.services.snipe-it.dataDir}/storage/app/backups";