From e219a636ca6318bb9c8b63fdfa9807bc89a02b6f Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 30 Jun 2025 19:50:16 +0700 Subject: [PATCH] checks: fix some tests not named correctly --- checks/borgbackup/default.nix | 2 +- checks/data-mesher/default.nix | 2 +- checks/installation/flake-module.nix | 4 ++-- checks/morph/flake-module.nix | 2 +- checks/mycelium/default.nix | 2 +- checks/syncthing/default.nix | 2 +- clanServices/admin/tests/vm/default.nix | 2 +- clanServices/borgbackup/tests/vm/default.nix | 3 +-- clanServices/garage/tests/vm/default.nix | 3 +-- clanServices/hello-world/tests/vm/default.nix | 6 +----- clanServices/mycelium/tests/vm/default.nix | 3 +-- clanServices/packages/tests/vm/default.nix | 2 +- clanServices/sshd/tests/vm/default.nix | 3 +-- clanServices/trusted-nix-caches/tests/vm/default.nix | 2 +- clanServices/users/tests/vm/default.nix | 2 +- clanServices/wifi/tests/vm/default.nix | 2 +- clanServices/zerotier/tests/vm/default.nix | 2 +- nixosModules/clanCore/machine-id/tests/flake-module.nix | 2 +- nixosModules/clanCore/state-version/tests/flake-module.nix | 2 +- pkgs/installer/flake-module.nix | 2 +- 20 files changed, 21 insertions(+), 29 deletions(-) diff --git a/checks/borgbackup/default.nix b/checks/borgbackup/default.nix index d58a9ae3c..b02311717 100644 --- a/checks/borgbackup/default.nix +++ b/checks/borgbackup/default.nix @@ -13,7 +13,7 @@ nixosLib.runTest ( hostPkgs = pkgs; - name = "borgbackup"; + name = "service-borgbackup"; clan = { directory = ./.; diff --git a/checks/data-mesher/default.nix b/checks/data-mesher/default.nix index 14a784691..45173f49f 100644 --- a/checks/data-mesher/default.nix +++ b/checks/data-mesher/default.nix @@ -20,7 +20,7 @@ nixosLib.runTest ( ]; hostPkgs = pkgs; - name = "data-mesher"; + name = "service-data-mesher"; clan = { directory = ./.; diff --git a/checks/installation/flake-module.nix b/checks/installation/flake-module.nix index 1fc5288f7..7bef4b82f 100644 --- a/checks/installation/flake-module.nix +++ b/checks/installation/flake-module.nix @@ -183,7 +183,7 @@ in # vm-test-run-test-installation-> target: Guest root shell did not produce any data yet... # vm-test-run-test-installation-> target: To debug, enter the VM and run 'systemctl status backdoor.service'. checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux && !pkgs.stdenv.isAarch64) { - installation = self.clanLib.test.baseTest { + nixos-test-installation = self.clanLib.test.baseTest { name = "installation"; nodes.target = { services.openssh.enable = true; @@ -210,7 +210,7 @@ in ''; } { inherit pkgs self; }; - update-hardware-configuration = self.clanLib.test.baseTest { + nixos-test-update-hardware-configuration = self.clanLib.test.baseTest { name = "update-hardware-configuration"; nodes.installer = installer; diff --git a/checks/morph/flake-module.nix b/checks/morph/flake-module.nix index e566edf57..244bb62c7 100644 --- a/checks/morph/flake-module.nix +++ b/checks/morph/flake-module.nix @@ -24,7 +24,7 @@ }: { checks = pkgs.lib.mkIf (pkgs.stdenv.isLinux && !pkgs.stdenv.isAarch64) { - morph = self.clanLib.test.baseTest { + nixos-test-morph = self.clanLib.test.baseTest { name = "morph"; nodes = { diff --git a/checks/mycelium/default.nix b/checks/mycelium/default.nix index a8194fa1b..7c3f2b297 100644 --- a/checks/mycelium/default.nix +++ b/checks/mycelium/default.nix @@ -13,7 +13,7 @@ nixosLib.runTest ( hostPkgs = pkgs; - name = "mycelium"; + name = "service-mycelium"; clan = { diff --git a/checks/syncthing/default.nix b/checks/syncthing/default.nix index d047e1c91..2fb295b93 100644 --- a/checks/syncthing/default.nix +++ b/checks/syncthing/default.nix @@ -14,7 +14,7 @@ nixosLib.runTest ( hostPkgs = pkgs; - name = "syncthing"; + name = "service-syncthing"; clan = { directory = ./.; diff --git a/clanServices/admin/tests/vm/default.nix b/clanServices/admin/tests/vm/default.nix index 188adb309..90bfd6605 100644 --- a/clanServices/admin/tests/vm/default.nix +++ b/clanServices/admin/tests/vm/default.nix @@ -2,7 +2,7 @@ let public-key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAII6zj7ubTg6z/aDwRNwvM/WlQdUocMprQ8E92NWxl6t+ test@test"; in { - name = "admin"; + name = "service-admin"; clan = { directory = ./.; diff --git a/clanServices/borgbackup/tests/vm/default.nix b/clanServices/borgbackup/tests/vm/default.nix index a2efb67be..6216039a3 100644 --- a/clanServices/borgbackup/tests/vm/default.nix +++ b/clanServices/borgbackup/tests/vm/default.nix @@ -1,10 +1,9 @@ { - module, pkgs, ... }: { - name = "borgbackup"; + name = "service-borgbackup"; clan = { directory = ./.; diff --git a/clanServices/garage/tests/vm/default.nix b/clanServices/garage/tests/vm/default.nix index a207751e8..d4aefe05a 100644 --- a/clanServices/garage/tests/vm/default.nix +++ b/clanServices/garage/tests/vm/default.nix @@ -1,10 +1,9 @@ { - module, pkgs, ... }: { - name = "garage"; + name = "service-garage"; clan = { directory = ./.; diff --git a/clanServices/hello-world/tests/vm/default.nix b/clanServices/hello-world/tests/vm/default.nix index 772c80085..3777772bf 100644 --- a/clanServices/hello-world/tests/vm/default.nix +++ b/clanServices/hello-world/tests/vm/default.nix @@ -1,9 +1,5 @@ { - module, - ... -}: -{ - name = "hello-service"; + name = "service-hello-service"; clan = { directory = ./.; diff --git a/clanServices/mycelium/tests/vm/default.nix b/clanServices/mycelium/tests/vm/default.nix index 7bde4cf76..d5cfd2c08 100644 --- a/clanServices/mycelium/tests/vm/default.nix +++ b/clanServices/mycelium/tests/vm/default.nix @@ -1,10 +1,9 @@ { - module, pkgs, ... }: { - name = "mycelium"; + name = "service-mycelium"; clan = { diff --git a/clanServices/packages/tests/vm/default.nix b/clanServices/packages/tests/vm/default.nix index 50705ca00..07421949e 100644 --- a/clanServices/packages/tests/vm/default.nix +++ b/clanServices/packages/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "packages"; + name = "service-packages"; clan = { directory = ./.; diff --git a/clanServices/sshd/tests/vm/default.nix b/clanServices/sshd/tests/vm/default.nix index afdfd964b..e4632ccea 100644 --- a/clanServices/sshd/tests/vm/default.nix +++ b/clanServices/sshd/tests/vm/default.nix @@ -1,10 +1,9 @@ { - module, pkgs, ... }: { - name = "sshd"; + name = "service-sshd"; clan = { directory = ./.; diff --git a/clanServices/trusted-nix-caches/tests/vm/default.nix b/clanServices/trusted-nix-caches/tests/vm/default.nix index 5d0a21b91..b255d7824 100644 --- a/clanServices/trusted-nix-caches/tests/vm/default.nix +++ b/clanServices/trusted-nix-caches/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "trusted-nix-caches"; + name = "service-trusted-nix-caches"; clan = { directory = ./.; diff --git a/clanServices/users/tests/vm/default.nix b/clanServices/users/tests/vm/default.nix index 672a4dcbf..c879ea136 100644 --- a/clanServices/users/tests/vm/default.nix +++ b/clanServices/users/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "users"; + name = "service-users"; clan = { directory = ./.; diff --git a/clanServices/wifi/tests/vm/default.nix b/clanServices/wifi/tests/vm/default.nix index eb50e93d4..a632da8e3 100644 --- a/clanServices/wifi/tests/vm/default.nix +++ b/clanServices/wifi/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "wifi"; + name = "service-wifi"; clan = { directory = ./.; diff --git a/clanServices/zerotier/tests/vm/default.nix b/clanServices/zerotier/tests/vm/default.nix index 59f555429..9e5029896 100644 --- a/clanServices/zerotier/tests/vm/default.nix +++ b/clanServices/zerotier/tests/vm/default.nix @@ -1,5 +1,5 @@ { - name = "zerotier"; + name = "service-zerotier"; clan = { directory = ./.; diff --git a/nixosModules/clanCore/machine-id/tests/flake-module.nix b/nixosModules/clanCore/machine-id/tests/flake-module.nix index b15299355..ddcace433 100644 --- a/nixosModules/clanCore/machine-id/tests/flake-module.nix +++ b/nixosModules/clanCore/machine-id/tests/flake-module.nix @@ -5,7 +5,7 @@ { clan.nixosTests.machine-id = { - name = "machine-id"; + name = "service-machine-id"; clan = { directory = ./.; diff --git a/nixosModules/clanCore/state-version/tests/flake-module.nix b/nixosModules/clanCore/state-version/tests/flake-module.nix index f5e65fa71..fa68c0a1c 100644 --- a/nixosModules/clanCore/state-version/tests/flake-module.nix +++ b/nixosModules/clanCore/state-version/tests/flake-module.nix @@ -5,7 +5,7 @@ { clan.nixosTests.state-version = { - name = "state-version"; + name = "service-state-version"; clan = { directory = ./.; diff --git a/pkgs/installer/flake-module.nix b/pkgs/installer/flake-module.nix index 51a06c30f..2a12f6c8b 100644 --- a/pkgs/installer/flake-module.nix +++ b/pkgs/installer/flake-module.nix @@ -78,6 +78,6 @@ in }; }; - flake.checks.x86_64-linux.flash-installer-disk-test = + flake.checks.x86_64-linux.nixos-test-flash-installer-disk = self.nixosConfigurations.flash-installer.config.system.build.installTest; }