heisenbridge: migrate to clan.nixosTests module

clanServices/heisenbridge/flake-module.nix

@@ -1,17 +1,18 @@
-{ lib, self, ... }:
+{ lib, ... }:
+let
+  module = lib.modules.importApply ./default.nix { };
+in
 {
   clan.modules = {
-    heisenbridge = lib.modules.importApply ./default.nix { };
+    heisenbridge = module;
   };
   perSystem =
-    { pkgs, ... }:
+    { ... }:
     {
-      checks = lib.optionalAttrs (pkgs.stdenv.isLinux) {
-        heisenbridge = import ./tests/vm/default.nix {
-          inherit pkgs;
-          clan-core = self;
-          nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
-        };
+      clan.nixosTests.heisenbridge = {
+        imports = [ ./tests/vm/default.nix ];
+
+        clan.modules."@clan/heisenbridge" = module;
       };
     };
 }

clanServices/heisenbridge/tests/vm/default.nix

@@ -1,65 +1,53 @@
 {
+  module,
   pkgs,
-  nixosLib,
-  clan-core,
   ...
 }:
+{
+  name = "heisenbridge";
 
-nixosLib.runTest (
-  { ... }:
-  {
-    imports = [
-      clan-core.modules.nixosVmTest.clanTest
-    ];
+  clan = {
+    directory = ./.;
+    inventory = {
+      machines.server = { };
 
-    hostPkgs = pkgs;
-
-    name = "heisenbridge";
-
-    clan = {
-      directory = ./.;
-      modules."@clan/heisenbridge" = ../../default.nix;
-      inventory = {
-        machines.server = { };
-
-        instances = {
-          heisenbridge-test = {
-            module.name = "@clan/heisenbridge";
-            roles.default.machines."server".settings = {
-              homeserver = "http://127.0.0.1:8008";
-            };
+      instances = {
+        heisenbridge-test = {
+          module.name = "@clan/heisenbridge";
+          roles.default.machines."server".settings = {
+            homeserver = "http://127.0.0.1:8008";
           };
         };
       };
     };
+  };
 
-    nodes = {
-      server = {
-        # Setup a minimal matrix-synapse to test with
-        services.matrix-synapse = {
-          enable = true;
-          settings.server_name = "example.com";
-          settings.database = {
-            name = "sqlite3";
-          };
+  nodes = {
+    server = {
+      # Setup a minimal matrix-synapse to test with
+      services.matrix-synapse = {
+        enable = true;
+        settings.server_name = "example.com";
+        settings.database = {
+          name = "sqlite3";
         };
       };
     };
+  };
 
-    testScript = ''
-      start_all()
+  testScript = ''
+    start_all()
 
-      server.wait_for_unit("matrix-synapse")
-      server.wait_for_unit("heisenbridge")
+    server.wait_for_unit("matrix-synapse")
+    server.wait_for_unit("heisenbridge")
 
-      # Check that heisenbridge is running
-      server.succeed("systemctl status heisenbridge")
+    # Check that heisenbridge is running
+    server.succeed("systemctl status heisenbridge")
 
-      # Wait for the bridge to initialize
-      server.wait_until_succeeds("journalctl -u heisenbridge | grep -q 'bridge is now running'")
+    # Wait for the bridge to initialize
+    server.wait_until_succeeds("journalctl -u heisenbridge | grep -q 'bridge is now running'")
 
-      # Check that heisenbridge is listening on the default port
-      server.succeed("${pkgs.netcat}/bin/nc -z -v 127.0.0.1 9898")
-    '';
-  }
-)
+    # Check that heisenbridge is listening on the default port
+    server.succeed("${pkgs.netcat}/bin/nc -z -v 127.0.0.1 9898")
+  '';
+}