From 95acdfa4f8efe4c54c53e47076eff86a2cfebf2d Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Mon, 9 Jun 2025 14:33:24 +0200
Subject: [PATCH] clanServices: Move deltachat test to appropriate location

Move the deltachat clanService test to the deltachat clan service.
The tests should live close to the definition of the service, so that
debugging and discoverability is better.
---
 checks/flake-module.nix                             |  1 -
 clanServices/deltachat/flake-module.nix             | 13 ++++++++++++-
 .../deltachat/tests/vm}/default.nix                 |  2 +-
 .../deltachat/tests/vm}/sops/users/admin/key.json   |  0
 4 files changed, 13 insertions(+), 3 deletions(-)
 rename {checks/deltachat => clanServices/deltachat/tests/vm}/default.nix (91%)
 rename {checks/deltachat => clanServices/deltachat/tests/vm}/sops/users/admin/key.json (100%)

diff --git a/checks/flake-module.nix b/checks/flake-module.nix
index e2c7a6666..377fc0633 100644
--- a/checks/flake-module.nix
+++ b/checks/flake-module.nix
@@ -54,7 +54,6 @@ in
               borgbackup = import ./borgbackup nixosTestArgs;
               data-mesher = import ./data-mesher nixosTestArgs;
               syncthing = import ./syncthing nixosTestArgs;
-              deltachat = import ./deltachat nixosTestArgs;
               ergochat = import ./ergochat nixosTestArgs;
               heisenbridge = import ./heisenbridge nixosTestArgs;
             }
diff --git a/clanServices/deltachat/flake-module.nix b/clanServices/deltachat/flake-module.nix
index 7cd0e8295..0fad43bfd 100644
--- a/clanServices/deltachat/flake-module.nix
+++ b/clanServices/deltachat/flake-module.nix
@@ -1,6 +1,17 @@
-{ lib, ... }:
+{ lib, self, ... }:
 {
   clan.modules = {
     deltachat = lib.modules.importApply ./default.nix { };
   };
+  perSystem =
+    { pkgs, ... }:
+    {
+      checks = lib.optionalAttrs (pkgs.stdenv.isLinux) {
+        deltachat = import ./tests/vm/default.nix {
+          inherit pkgs;
+          clan-core = self;
+          nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
+        };
+      };
+    };
 }
diff --git a/checks/deltachat/default.nix b/clanServices/deltachat/tests/vm/default.nix
similarity index 91%
rename from checks/deltachat/default.nix
rename to clanServices/deltachat/tests/vm/default.nix
index 0183e13a3..7b25c41f4 100644
--- a/checks/deltachat/default.nix
+++ b/clanServices/deltachat/tests/vm/default.nix
@@ -17,7 +17,7 @@ nixosLib.runTest (
 
     clan = {
       directory = ./.;
-      modules."@clan/deltachat" = ../../clanServices/deltachat/default.nix;
+      modules."@clan/deltachat" = ../../default.nix;
       inventory = {
         machines.server = { };
 
diff --git a/checks/deltachat/sops/users/admin/key.json b/clanServices/deltachat/tests/vm/sops/users/admin/key.json
similarity index 100%
rename from checks/deltachat/sops/users/admin/key.json
rename to clanServices/deltachat/tests/vm/sops/users/admin/key.json