nixosTests.scion-freestanding-deployment: handleTest -> runTest

nixos/tests/all-tests.nix

@@ -1262,7 +1262,7 @@ in
   saunafs = runTest ./saunafs.nix;
   scaphandre = handleTest ./scaphandre.nix { };
   schleuder = runTest ./schleuder.nix;
-  scion-freestanding-deployment = handleTest ./scion/freestanding-deployment { };
+  scion-freestanding-deployment = runTest ./scion/freestanding-deployment;
   scrutiny = runTest ./scrutiny.nix;
   scx = runTest ./scx/default.nix;
   sddm = import ./sddm.nix { inherit runTest; };

nixos/tests/scion/freestanding-deployment/default.nix

@@ -1,7 +1,6 @@
 # implements https://github.com/scionproto/scion/blob/27983125bccac6b84d1f96f406853aab0e460405/doc/tutorials/deploy.rst
-import ../../make-test-python.nix (
-  { pkgs, ... }:
-  let
+{ pkgs, ... }:
+let
   trust-root-configuration-keys = pkgs.runCommand "generate-trc-keys.sh" {
     buildInputs = [
       pkgs.scion
@@ -9,7 +8,7 @@ import ../../make-test-python.nix (
   } (builtins.readFile ./bootstrap.sh);
 
   imports = hostId: [
-      ({
+    {
       services.scion = {
         enable = true;
         bypassBootstrapWarning = true;
@@ -32,30 +31,22 @@ import ../../make-test-python.nix (
       environment.systemPackages = [
         pkgs.scion
       ];
-      })
+    }
   ];
-  in
-  {
+in
+{
   name = "scion-test";
   nodes = {
-      scion01 =
-        { ... }:
-        {
+    scion01 = {
       imports = (imports 1);
     };
-      scion02 =
-        { ... }:
-        {
+    scion02 = {
       imports = (imports 2);
     };
-      scion03 =
-        { ... }:
-        {
+    scion03 = {
       imports = (imports 3);
     };
-      scion04 =
-        { ... }:
-        {
+    scion04 = {
       imports = (imports 4);
       networking.interfaces."lo".ipv4.addresses = [
         {
@@ -82,9 +73,7 @@ import ../../make-test-python.nix (
         };
       };
     };
-      scion05 =
-        { ... }:
-        {
+    scion05 = {
       imports = (imports 5);
       networking.interfaces."lo".ipv4.addresses = [
         {
@@ -207,5 +196,4 @@ import ../../make-test-python.nix (
       wait_for_unit("scion-control.service")
       succeed("${pingAll} >&2")
     '';
-  }
-)
+}