From bae360b3b76d607ca69914ca932a650aaedfb4aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 23 Oct 2024 09:44:39 +0200 Subject: [PATCH 1/3] remove unused nixos-images flake input --- flake.lock | 22 ---------------------- flake.nix | 5 +---- 2 files changed, 1 insertion(+), 26 deletions(-) diff --git a/flake.lock b/flake.lock index 7fca7a00d..3d9acc4bd 100644 --- a/flake.lock +++ b/flake.lock @@ -55,27 +55,6 @@ "type": "github" } }, - "nixos-images": { - "inputs": { - "nixos-stable": [], - "nixos-unstable": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1729127036, - "narHash": "sha256-NGLgmG+s6jY15TImq8i3GS0IuCCcNSt2McS20q9xRCs=", - "owner": "nix-community", - "repo": "nixos-images", - "rev": "3103f26e0631a543963c03c583f03fd42fd9d51a", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixos-images", - "type": "github" - } - }, "nixpkgs": { "locked": { "lastModified": 1729265718, @@ -97,7 +76,6 @@ "disko": "disko", "flake-parts": "flake-parts", "nixos-facter-modules": "nixos-facter-modules", - "nixos-images": "nixos-images", "nixpkgs": "nixpkgs", "sops-nix": "sops-nix", "systems": "systems", diff --git a/flake.nix b/flake.nix index 859789fa6..add03fe2b 100644 --- a/flake.nix +++ b/flake.nix @@ -8,13 +8,10 @@ sops-nix.url = "github:Mic92/sops-nix"; sops-nix.inputs.nixpkgs.follows = "nixpkgs"; sops-nix.inputs.nixpkgs-stable.follows = ""; - nixos-images.url = "github:nix-community/nixos-images"; - nixos-images.inputs.nixos-unstable.follows = "nixpkgs"; - # unused input - nixos-images.inputs.nixos-stable.follows = ""; flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.inputs.nixpkgs-lib.follows = "nixpkgs"; systems.url = "github:nix-systems/default"; + treefmt-nix.url = "github:numtide/treefmt-nix"; treefmt-nix.inputs.nixpkgs.follows = "nixpkgs"; From 76b80304ca43887484b8225eefb4f15182feee0e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 23 Oct 2024 09:48:50 +0200 Subject: [PATCH 2/3] tests/command: also wait for processes to avoid leaks --- pkgs/clan-app/tests/command.py | 1 + 1 file changed, 1 insertion(+) diff --git a/pkgs/clan-app/tests/command.py b/pkgs/clan-app/tests/command.py index 1dfee4e14..da85bcfff 100644 --- a/pkgs/clan-app/tests/command.py +++ b/pkgs/clan-app/tests/command.py @@ -49,6 +49,7 @@ class Command: for p in reversed(self.processes): with contextlib.suppress(OSError): os.killpg(os.getpgid(p.pid), signal.SIGKILL) + p.wait() @pytest.fixture From eb481d6cfffaf238a19fe665acc24738747d20a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Wed, 23 Oct 2024 09:50:08 +0200 Subject: [PATCH 3/3] test_modules: add missing check argument --- pkgs/clan-cli/tests/test_modules.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/clan-cli/tests/test_modules.py b/pkgs/clan-cli/tests/test_modules.py index 162ef6285..486a40726 100644 --- a/pkgs/clan-cli/tests/test_modules.py +++ b/pkgs/clan-cli/tests/test_modules.py @@ -68,7 +68,7 @@ def test_add_module_to_inventory( } ) ) - subprocess.run(["git", "add", "."], cwd=test_flake_with_core.path) + subprocess.run(["git", "add", "."], cwd=test_flake_with_core.path, check=True) inventory = load_inventory_json(base_path)