nixosTests: extract disko-install-menu tests into extra file

Author: Zocker1999NET

nix/checks/nixosTests/default.nix

@@ -5,6 +5,10 @@
 
   _class = "flake";
 
+  imports = [
+    ./diskoInstallMenu.nix
+  ];
+
   perSystem =
     { importWithSystem, ... }@systemArg:
     {

nix/checks/nixosTests/diskoInstallMenu.nix

@@ -0,0 +1,64 @@
+{
+  inputs,
+  self,
+  ...
+}:
+{
+  _class = "flake";
+  perSystem =
+    { pkgs, ... }:
+    {
+      checks = {
+
+        # similar to disko-install-menu.checks.SYSTEM.offineBuilds-*
+        # (TODO in disko-install-menu, export test framework & use here)
+        diskoOfflineInstall = pkgs.testers.runNixOSTest {
+          name = "diskoOfflineInstall";
+          # similar as above: allow customizations with overlays
+          node.pkgsReadOnly = false;
+          nodes.node.imports = [
+            inputs.disko-install-menu.nixosModules.default
+            {
+              programs.disko-install-menu = {
+                enable = true;
+                offlineCapable = true;
+                options = {
+                  defaultFlake = "${self}";
+                  defaultHost = "empty";
+                };
+                listedFlakes.defaultFlake = {
+                  offlineHosts.empty = true;
+                  offlineReference = self;
+                };
+              };
+              virtualisation = {
+                memorySize = 4 * 1024;
+                useNixStoreImage = true; # verify that installer can run with all detected dependencies (see https://github.com/NixOS/nix/issues/14207)
+                writableStore = true;
+              };
+            }
+            # make offlineCapable tests fail more likely when installer config is designed more minimalistically
+            {
+              xdg.mime.enable = false;
+            }
+            ./../../offlineInstallDeps.nix
+          ];
+          testScript = ''
+            node.start()
+            node.wait_for_unit("default.target")
+
+            # ensure offline
+            node.block()
+            node.execute("ip -4 route del default")
+            node.execute("ip -6 route del default")
+            node.fail("ping -c 2 9.9.9.9")
+            node.fail("ping -c 2 2620:fe::fe")
+
+            # execute build
+            node.succeed("disko-install-menu --debug-test-build")
+          '';
+        };
+
+      };
+    };
+}

nix/checks/nixosTests/legacy.nix

@@ -64,55 +64,6 @@ in
     '';
   };
 
-  # similar to disko-install-menu.checks.SYSTEM.offineBuilds-*
-  # (TODO in disko-install-menu, export test framework & use here)
-  diskoOfflineInstall = pkgs.testers.runNixOSTest {
-    name = "diskoOfflineInstall";
-    # similar as above: allow customizations with overlays
-    node.pkgsReadOnly = false;
-    nodes.node.imports = [
-      inputs.disko-install-menu.nixosModules.default
-      {
-        programs.disko-install-menu = {
-          enable = true;
-          offlineCapable = true;
-          options = {
-            defaultFlake = "${self}";
-            defaultHost = "empty";
-          };
-          listedFlakes.defaultFlake = {
-            offlineHosts.empty = true;
-            offlineReference = self;
-          };
-        };
-        virtualisation = {
-          memorySize = 4 * 1024;
-          useNixStoreImage = true; # verify that installer can run with all detected dependencies (see https://github.com/NixOS/nix/issues/14207)
-          writableStore = true;
-        };
-      }
-      # make offlineCapable tests fail more likely when installer config is designed more minimalistically
-      {
-        xdg.mime.enable = false;
-      }
-      ./../../offlineInstallDeps.nix
-    ];
-    testScript = ''
-      node.start()
-      node.wait_for_unit("default.target")
-
-      # ensure offline
-      node.block()
-      node.execute("ip -4 route del default")
-      node.execute("ip -6 route del default")
-      node.fail("ping -c 2 9.9.9.9")
-      node.fail("ping -c 2 2620:fe::fe")
-
-      # execute build
-      node.succeed("disko-install-menu --debug-test-build")
-    '';
-  };
-
   dynamicIssue-module-sshHostKey = nixosTest {
     name = "dynamicIssue-module-sshHostKey";
     nodes.node = {