Add test for deltachat clanService

checks/deltachat/default.nix

@@ -1,28 +1,51 @@
-(import ../lib/container-test.nix) (
-  { pkgs, ... }:
 {
-    name = "deltachat";
+  pkgs,
-
+  nixosLib,
-    nodes.machine =
+  clan-core,
-      { self, ... }:
+  ...
+}:
+nixosLib.runTest (
+  { ... }:
   {
     imports = [
-          self.clanModules.deltachat
+      clan-core.modules.nixosVmTest.clanTest
-          self.nixosModules.clanCore
-          {
-            clan.core.settings.directory = ./.;
-          }
     ];
+
+    hostPkgs = pkgs;
+
+    name = "deltachat";
+
+    clan = {
+      directory = ./.;
+      modules."@clan/deltachat" = ../../clanServices/deltachat/default.nix;
+      inventory = {
+        machines.server = { };
+
+        instances = {
+          deltachat-test = {
+            module.name = "@clan/deltachat";
+            roles.default.machines."server".settings = { };
           };
+        };
+      };
+    };
+
+    nodes = {
+      server = { };
+    };
+
     testScript = ''
       start_all()
-      machine.wait_for_unit("maddy")
+
+      server.wait_for_unit("network-online.target")
+      server.wait_for_unit("maddy")
+
       # imap
-      machine.succeed("${pkgs.netcat}/bin/nc -z -v ::1 143")
+      server.succeed("${pkgs.netcat}/bin/nc -z -v ::1 143")
       # smtp submission
-      machine.succeed("${pkgs.netcat}/bin/nc -z -v ::1 587")
+      server.succeed("${pkgs.netcat}/bin/nc -z -v ::1 587")
       # smtp
-      machine.succeed("${pkgs.netcat}/bin/nc -z -v ::1 25")
+      server.succeed("${pkgs.netcat}/bin/nc -z -v ::1 25")
     '';
   }
 )

checks/deltachat/sops/users/admin/key.json

@@ -0,0 +1,4 @@
+{
+  "publickey": "age1qm0p4vf9jvcnn43s6l4prk8zn6cx0ep9gzvevxecv729xz540v8qa742eg",
+  "type": "age"
+}

checks/flake-module.nix

@@ -38,8 +38,8 @@ in
           };
           nixosTests =
             lib.optionalAttrs (pkgs.stdenv.isLinux) {
-              # Deltachat is currently marked as broken
+              # Deltachat test
-              # deltachat = import ./deltachat nixosTestArgs;
+              deltachat = import ./deltachat nixosTestArgs;
 
               # Base Tests
               secrets = self.clanLib.test.baseTest ./secrets nixosTestArgs;