From 55f41b5f04efee81b4ab48899214bc59448af325 Mon Sep 17 00:00:00 2001
From: tv <tv@krebsco.de>
Date: Thu, 12 Nov 2026 02:33:43 +0000
Subject: populate: stop the ssh master also after failures

Populate stopped the ssh master at the end of its script, which a failure
skips.  The master then stays for an hour, with its control socket gone
along with populate's temporary directory.  Populate stops it on exit
now, before removing that directory.

An edge case checks that no master remains after a failing and after a
succeeding deploy.
---
 tests/scenarios.nix | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

(limited to 'tests')

diff --git a/tests/scenarios.nix b/tests/scenarios.nix
index 9760e54..307e521 100644
--- a/tests/scenarios.nix
+++ b/tests/scenarios.nix
@@ -843,6 +843,30 @@ assert !(krops.isLocalTarget (targets.remote "/"));
         }
       ];
     })
+    # The ssh master stops, after failing as well as after succeeding.
+    (s "ssh-master" (let
+      checkDeployer = ''
+        for i in 1 2 3 4 5 6 7 8 9 10; do
+          if ! pgrep -f 'ssh: .*/populate\..*\[mux\]' >/dev/null; then
+            exit 0
+          fi
+          sleep 0.5
+        done
+        fail "ssh master remains"
+      '';
+    in {
+      phases = [
+        {
+          sources.x.flake-input = { flake = "/fixtures/top"; name = "nope"; inherit fetchOnTarget; };
+          expect.fail = "error: flake /fixtures/top has no input nope";
+          inherit checkDeployer;
+        }
+        {
+          sources = alt;
+          inherit checkDeployer;
+        }
+      ];
+    }))
   ] ++ lib.optional (targetKind == "local")
     # The target has the path the input is locked to.
     (s "uselocal" {
-- 
cgit v1.3.1