From 611c961dcfa462f8261fafe1f67d86a218ed7b04 Mon Sep 17 00:00:00 2001
From: Kiara Grouwstra <kiara@procolix.eu>
Date: Thu, 19 Jun 2025 18:11:08 +0200
Subject: [PATCH] separate test declarations from invocations (#396)

see https://git.fediversity.eu/Fediversity/Fediversity/pulls/395#issuecomment-8024

Reviewed-on: https://git.fediversity.eu/Fediversity/Fediversity/pulls/396
Reviewed-by: Valentin Gagarin <valentin.gagarin@tweag.io>
Co-authored-by: Kiara Grouwstra <kiara@procolix.eu>
Co-committed-by: Kiara Grouwstra <kiara@procolix.eu>
---
 services/default.nix               | 6 +++---
 services/tests/mastodon.nix        | 2 +-
 services/tests/peertube.nix        | 2 +-
 services/tests/pixelfed-garage.nix | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/services/default.nix b/services/default.nix
index a1c868ad..3117b861 100644
--- a/services/default.nix
+++ b/services/default.nix
@@ -6,8 +6,8 @@
 }:
 {
   tests = {
-    mastodon = import ./tests/mastodon.nix { inherit pkgs; };
-    pixelfed-garage = import ./tests/pixelfed-garage.nix { inherit pkgs; };
-    peertube = import ./tests/peertube.nix { inherit pkgs; };
+    mastodon = pkgs.nixosTest ./tests/mastodon.nix;
+    pixelfed-garage = pkgs.nixosTest ./tests/pixelfed-garage.nix;
+    peertube = pkgs.nixosTest ./tests/peertube.nix;
   };
 }
diff --git a/services/tests/mastodon.nix b/services/tests/mastodon.nix
index 244f0304..f5497520 100644
--- a/services/tests/mastodon.nix
+++ b/services/tests/mastodon.nix
@@ -42,7 +42,7 @@ let
       '';
 in
 
-pkgs.nixosTest {
+{
   name = "mastodon";
 
   nodes = {
diff --git a/services/tests/peertube.nix b/services/tests/peertube.nix
index 27d79589..475c3f54 100644
--- a/services/tests/peertube.nix
+++ b/services/tests/peertube.nix
@@ -161,7 +161,7 @@ let
   '';
 in
 
-pkgs.nixosTest {
+{
   name = "peertube";
 
   nodes = {
diff --git a/services/tests/pixelfed-garage.nix b/services/tests/pixelfed-garage.nix
index 13ad1ef7..66116774 100644
--- a/services/tests/pixelfed-garage.nix
+++ b/services/tests/pixelfed-garage.nix
@@ -114,7 +114,7 @@ let
         ${seleniumQuit}'';
 
 in
-pkgs.nixosTest {
+{
   name = "test-pixelfed-garage";
 
   nodes = {