clan tests: convert makeTestClan to a module

Let's not put yet another wrapper around runTest, instead expose our logic as a module that can be imported into any nixos-vm-test

clanServices/hello-world/flake-module.nix

@@ -47,8 +47,8 @@ in
           hello-service = import ./tests/vm/default.nix {
             inherit module;
             inherit self inputs pkgs;
-            # clanLib is exposed from inputs.clan-core
-            clanLib = self.clanLib;
+            nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
+            clan-core = self;
           };
         };
     };

clanServices/hello-world/tests/vm/default.nix

@@ -1,41 +1,44 @@
 {
   pkgs,
-  self,
-  clanLib,
+  nixosLib,
+  clan-core,
   module,
   ...
 }:
-clanLib.test.makeTestClan {
-  inherit pkgs self;
-  nixosTest = (
-    { ... }:
-    {
-      name = "hello-service";
+nixosLib.runTest (
+  { ... }:
+  {
+    imports = [
+      clan-core.modules.nixosVmTest.clanTest
+    ];
 
-      clan = {
-        directory = ./.;
-        modules = {
-          hello-service = module;
-        };
-        inventory = {
-          machines.peer1 = { };
+    hostPkgs = pkgs;
 
-          instances."test" = {
-            module.name = "hello-service";
-            roles.peer.machines.peer1 = { };
-          };
+    name = "hello-service";
+
+    clan = {
+      directory = ./.;
+      modules = {
+        hello-service = module;
+      };
+      inventory = {
+        machines.peer1 = { };
+
+        instances."test" = {
+          module.name = "hello-service";
+          roles.peer.machines.peer1 = { };
         };
       };
+    };
 
-      testScript =
-        { nodes, ... }:
-        ''
-          start_all()
+    testScript =
+      { nodes, ... }:
+      ''
+        start_all()
 
-          # peer1 should have the 'hello' file
-          value = peer1.succeed("cat ${nodes.peer1.clan.core.vars.generators.hello.files.hello.path}")
-          assert value.strip() == "Hello world from peer1", value
-        '';
-    }
-  );
-}
+        # peer1 should have the 'hello' file
+        value = peer1.succeed("cat ${nodes.peer1.clan.core.vars.generators.hello.files.hello.path}")
+        assert value.strip() == "Hello world from peer1", value
+      '';
+  }
+)

clanServices/wifi/flake-module.nix

@@ -28,8 +28,9 @@ in
         lib.optionalAttrs (pkgs.stdenv.isLinux) {
           wifi-service = import ./tests/vm/default.nix {
             inherit module;
-            inherit self inputs pkgs;
-            clanLib = self.clanLib;
+            inherit inputs pkgs;
+            clan-core = self;
+            nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
           };
         };
     };

clanServices/wifi/tests/vm/default.nix

@@ -1,43 +1,46 @@
 {
   pkgs,
-  self,
-  clanLib,
+  nixosLib,
+  clan-core,
   module,
   ...
 }:
-clanLib.test.makeTestClan {
-  inherit pkgs self;
-  nixosTest = (
-    { ... }:
-    {
-      name = "wifi-service";
+nixosLib.runTest (
+  { ... }:
+  {
+    imports = [
+      clan-core.modules.nixosVmTest.clanTest
+    ];
 
-      clan = {
-        directory = ./.;
-        test.useContainers = false;
-        modules."@clan/wifi" = module;
-        inventory = {
+    hostPkgs = pkgs;
 
-          machines.test = { };
+    name = "wifi-service";
 
-          instances = {
-            wg-test-one = {
-              module.name = "@clan/wifi";
+    clan = {
+      directory = ./.;
+      test.useContainers = false;
+      modules."@clan/wifi" = module;
+      inventory = {
 
-              roles.default.machines = {
-                test.settings.networks.one = { };
-              };
+        machines.test = { };
+
+        instances = {
+          wg-test-one = {
+            module.name = "@clan/wifi";
+
+            roles.default.machines = {
+              test.settings.networks.one = { };
             };
           };
         };
       };
+    };
 
-      testScript = ''
-        start_all()
-        test.wait_for_unit("NetworkManager.service")
-        psk = test.succeed("cat /run/NetworkManager/system-connections/one.nmconnection")
-        assert "password-eins" in psk, "Password is incorrect"
-      '';
-    }
-  );
-}
+    testScript = ''
+      start_all()
+      test.wait_for_unit("NetworkManager.service")
+      psk = test.succeed("cat /run/NetworkManager/system-connections/one.nmconnection")
+      assert "password-eins" in psk, "Password is incorrect"
+    '';
+  }
+)