From 025dd0f9b36aa0e88a222f50f7ee9b73254b1ef6 Mon Sep 17 00:00:00 2001
From: a-kenji <aks.kenji@protonmail.com>
Date: Mon, 9 Jun 2025 14:50:27 +0200
Subject: [PATCH] clanServices: Move ergochat test to appropriate location

Move the ergochat clanService test to the ergochat 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/ergochat/flake-module.nix              | 13 ++++++++++++-
 .../ergochat/tests/vm}/default.nix                  |  2 +-
 .../ergochat/tests/vm}/sops/users/admin/key.json    |  0
 4 files changed, 13 insertions(+), 3 deletions(-)
 rename {checks/ergochat => clanServices/ergochat/tests/vm}/default.nix (92%)
 rename {checks/ergochat => clanServices/ergochat/tests/vm}/sops/users/admin/key.json (100%)

diff --git a/checks/flake-module.nix b/checks/flake-module.nix
index da26ba1f5..55a18e751 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;
-              ergochat = import ./ergochat nixosTestArgs;
             }
             // lib.optionalAttrs (pkgs.stdenv.hostPlatform.system == "aarch64-linux") {
               # for some reason this hangs in an odd place in CI, but it works on my machine ...
diff --git a/clanServices/ergochat/flake-module.nix b/clanServices/ergochat/flake-module.nix
index 3d74faf19..c0dde306a 100644
--- a/clanServices/ergochat/flake-module.nix
+++ b/clanServices/ergochat/flake-module.nix
@@ -1,6 +1,17 @@
-{ lib, ... }:
+{ lib, self, ... }:
 {
   clan.modules = {
     ergochat = lib.modules.importApply ./default.nix { };
   };
+  perSystem =
+    { pkgs, ... }:
+    {
+      checks = lib.optionalAttrs (pkgs.stdenv.isLinux) {
+        ergochat = import ./tests/vm/default.nix {
+          inherit pkgs;
+          clan-core = self;
+          nixosLib = import (self.inputs.nixpkgs + "/nixos/lib") { };
+        };
+      };
+    };
 }
diff --git a/checks/ergochat/default.nix b/clanServices/ergochat/tests/vm/default.nix
similarity index 92%
rename from checks/ergochat/default.nix
rename to clanServices/ergochat/tests/vm/default.nix
index b9a06359f..f474bd40e 100644
--- a/checks/ergochat/default.nix
+++ b/clanServices/ergochat/tests/vm/default.nix
@@ -16,7 +16,7 @@ nixosLib.runTest (
 
     clan = {
       directory = ./.;
-      modules."@clan/ergochat" = ../../clanServices/ergochat/default.nix;
+      modules."@clan/ergochat" = ../../default.nix;
       inventory = {
         machines.server = { };
 
diff --git a/checks/ergochat/sops/users/admin/key.json b/clanServices/ergochat/tests/vm/sops/users/admin/key.json
similarity index 100%
rename from checks/ergochat/sops/users/admin/key.json
rename to clanServices/ergochat/tests/vm/sops/users/admin/key.json