From a43eee2860004f3b6880befa12a0fb764f9cfb72 Mon Sep 17 00:00:00 2001 From: DavHau Date: Mon, 30 Jun 2025 19:14:24 +0700 Subject: [PATCH] checks: prefix all nixos tests with `nixos-test-` --- checks/backups/flake-module.nix | 4 ++-- checks/flake-module.nix | 26 +++++++++++++------------- checks/flash/flake-module.nix | 2 +- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/checks/backups/flake-module.nix b/checks/backups/flake-module.nix index 452a07e6f..fe6ad4e27 100644 --- a/checks/backups/flake-module.nix +++ b/checks/backups/flake-module.nix @@ -151,8 +151,8 @@ in { checks = pkgs.lib.mkIf pkgs.stdenv.isLinux { - backups = self.clanLib.test.containerTest { - name = "backups"; + nixos-test-backups = self.clanLib.test.containerTest { + name = "nixos-test-backups"; nodes.machine = { imports = [ diff --git a/checks/flake-module.nix b/checks/flake-module.nix index 6cd99353c..302934624 100644 --- a/checks/flake-module.nix +++ b/checks/flake-module.nix @@ -41,21 +41,21 @@ in nixosTests = lib.optionalAttrs (pkgs.stdenv.isLinux) { # Base Tests - secrets = self.clanLib.test.baseTest ./secrets nixosTestArgs; - borgbackup-legacy = self.clanLib.test.baseTest ./borgbackup-legacy nixosTestArgs; - wayland-proxy-virtwl = self.clanLib.test.baseTest ./wayland-proxy-virtwl nixosTestArgs; + nixos-test-secrets = self.clanLib.test.baseTest ./secrets nixosTestArgs; + nixos-test-borgbackup-legacy = self.clanLib.test.baseTest ./borgbackup-legacy nixosTestArgs; + nixos-test-wayland-proxy-virtwl = self.clanLib.test.baseTest ./wayland-proxy-virtwl nixosTestArgs; # Container Tests - container = self.clanLib.test.containerTest ./container nixosTestArgs; - zt-tcp-relay = self.clanLib.test.containerTest ./zt-tcp-relay nixosTestArgs; - matrix-synapse = self.clanLib.test.containerTest ./matrix-synapse nixosTestArgs; - postgresql = self.clanLib.test.containerTest ./postgresql nixosTestArgs; - user-firewall-iptables = self.clanLib.test.containerTest ./user-firewall/iptables.nix nixosTestArgs; - user-firewall-nftables = self.clanLib.test.containerTest ./user-firewall/nftables.nix nixosTestArgs; + nixos-test-container = self.clanLib.test.containerTest ./container nixosTestArgs; + nixos-test-zt-tcp-relay = self.clanLib.test.containerTest ./zt-tcp-relay nixosTestArgs; + nixos-test-matrix-synapse = self.clanLib.test.containerTest ./matrix-synapse nixosTestArgs; + nixos-test-postgresql = self.clanLib.test.containerTest ./postgresql nixosTestArgs; + nixos-test-user-firewall-iptables = self.clanLib.test.containerTest ./user-firewall/iptables.nix nixosTestArgs; + nixos-test-user-firewall-nftables = self.clanLib.test.containerTest ./user-firewall/nftables.nix nixosTestArgs; service-dummy-test = import ./service-dummy-test nixosTestArgs; service-dummy-test-from-flake = import ./service-dummy-test-from-flake nixosTestArgs; - data-mesher = import ./data-mesher nixosTestArgs; + service-data-mesher = import ./data-mesher nixosTestArgs; }; packagesToBuild = lib.removeAttrs self'.packages [ @@ -128,10 +128,10 @@ in in lib.optionalAttrs (pkgs.stdenv.isLinux) { # import our test - secrets = import ./secrets nixosTestArgs; - container = import ./container nixosTestArgs; + nixos-test-secrets = import ./secrets nixosTestArgs; + nixos-test-container = import ./container nixosTestArgs; # Clan app tests - app-ocr = self.clanLib.test.baseTest ./app-ocr nixosTestArgs; + nixos-test-app-ocr = self.clanLib.test.baseTest ./app-ocr nixosTestArgs; }; }; }; diff --git a/checks/flash/flake-module.nix b/checks/flash/flake-module.nix index 96e2d1f47..713dcbfc0 100644 --- a/checks/flash/flake-module.nix +++ b/checks/flash/flake-module.nix @@ -57,7 +57,7 @@ in { checks = pkgs.lib.mkIf pkgs.stdenv.isLinux { - flash = self.clanLib.test.baseTest { + nixos-test-flash = self.clanLib.test.baseTest { name = "flash"; nodes.target = { virtualisation.emptyDiskImages = [ 4096 ];