fix: use subtests

Author: fricklerhandwerk

nix/tests.nix

@@ -25,32 +25,22 @@ let
   };
 in
 lib.mapAttrs (name: test: pkgs.testers.runNixOSTest (test // { inherit name defaults; })) {
-  application-tests = {
-    nodes.server = _: { imports = [ ./configuration.nix ]; };
-    # run all application-level tests managed by Django
-    # https://docs.djangoproject.com/en/5.0/topics/testing/overview/
-    testScript = ''
-      server.wait_for_unit("${application}-server.service")
-      server.succeed("manage test shared")
-      server.succeed("manage test webview")
-    '';
-  };
-  css = {
-    nodes.server = _: { imports = [ ./web-security-tracker.nix ]; };
-    # check that the style sheet is served
-    testScript = ''
-      server.wait_for_unit("${application}-server.service")
-      server.wait_for_open_port(8000)
-      machine.succeed("curl --fail -H 'Host: example.org' http://127.0.0.1:80/static/style.css")
-    '';
-  };
-  admin = {
+  basic = {
     nodes.server = _: { imports = [ ./web-security-tracker.nix ]; };
-    # check that the admin interface is served
     testScript = ''
       server.wait_for_unit("${application}-server.service")
-      server.wait_for_open_port(8000)
-      server.succeed("curl --fail -L -H 'Host: example.org' http://localhost/admin")
+      server.wait_for_unit("${application}-worker.service")
+
+      with subtest("Django application tests"):
+        # https://docs.djangoproject.com/en/5.0/topics/testing/overview/
+        server.succeed("wst-manage test shared")
+        server.succeed("wst-manage test webview")
+
+      with subtest("Check that stylesheet is served"):
+        machine.succeed("curl --fail -H 'Host: example.org' http://localhost/static/style.css")
+
+      with subtest("Check that admin interface is served"):
+        server.succeed("curl --fail -L -H 'Host: example.org' http://localhost/admin")
     '';
   };
 }