From 0e9fc2cc152b4a4d9fd736f107412ace2a0c2555 Mon Sep 17 00:00:00 2001
From: kshitijk4poor <82637225+kshitijk4poor@users.noreply.github.com>
Date: Wed, 9 Sep 2026 10:46:57 +0530
Subject: [PATCH] test(process-registry): exercise the portable probe payload

Execute the selected no-op rather than freeze its spelling, while rejecting
/bin/true to model the NixOS failure. Mark the regression Linux-only and
retain the current user-bus environment handling.

Consolidates the earlier NixOS scope-probe report and fix in #102587 with
the PATH-independent payload from #105436. The fallback resolver is not
needed when /bin/sh is used directly.

Co-authored-by: Scott Garrand <sgarrand@gmail.com>
---
 tests/tools/test_process_registry.py | 34 ++++++++++++----------------
 tools/process_registry.py            |  6 ++---
 2 files changed, 17 insertions(+), 23 deletions(-)

diff --git a/tests/tools/test_process_registry.py b/tests/tools/test_process_registry.py
index 8ce784f032..e4369f0fda 100644
--- a/tests/tools/test_process_registry.py
+++ b/tests/tools/test_process_registry.py
@@ -2430,33 +2430,29 @@ class TestSystemdCgroupIsolation:
         assert "XDG_RUNTIME_DIR" not in os.environ
         assert "DBUS_SESSION_BUS_ADDRESS" not in os.environ
 
-    def test_probe_uses_portable_payload_not_hardcoded_bin_true(
-        self, registry, monkeypatch
-    ):
-        """The probe payload must not hardcode ``/bin/true``: NixOS has no FHS
-        ``/bin`` (only ``sh``), so an absolute ``/bin/true`` probe fails there for
-        a reason unrelated to scope availability and disables restart-safe cron
-        dispatch on every scheduled fire (#105365). The payload is
-        ``/bin/sh -c 'exit 0'``, which exists on every Linux."""
+    @pytest.mark.linux_only
+    def test_probe_succeeds_without_bin_true(self, monkeypatch):
+        """An absent ``/bin/true`` must not make a usable scope fail its probe."""
         import tools.process_registry as pr
 
         monkeypatch.setattr(pr, "_SYSTEMD_SCOPE_AVAILABLE", None)
-        monkeypatch.setattr(pr, "_SYSTEMD_SCOPE_PROBED_AT", 0.0, raising=False)
-        probe_calls = []
+        monkeypatch.setattr(pr, "_SYSTEMD_SCOPE_PROBED_AT", 0.0)
+        real_run = subprocess.run
+        executed = []
 
-        def fake_run(*args, **kwargs):
-            probe_calls.append(args)
-            return subprocess.CompletedProcess(args=args[0], returncode=0)
+        def systemd_run_on_nixos_shaped_root(argv, **kwargs):
+            # Simulate NixOS's missing executable, but run the selected replacement.
+            payload = argv[argv.index("--") + 1 :]
+            if payload[0] == "/bin/true":
+                return subprocess.CompletedProcess(payload, 127, stderr=b"No such file or directory")
+            executed.append(payload)
+            return real_run(payload, **kwargs)
 
         monkeypatch.setattr("shutil.which", lambda name: "/usr/bin/systemd-run")
-        monkeypatch.setattr("subprocess.run", fake_run)
+        monkeypatch.setattr("subprocess.run", systemd_run_on_nixos_shaped_root)
 
         assert pr._systemd_run_user_scope_available() is True
-        probe_argv = probe_calls[0][0]
-        sep_idx = probe_argv.index("--")
-        payload = probe_argv[sep_idx + 1 :]
-        assert "/bin/true" not in payload, probe_argv
-        assert payload[:3] == ["/bin/sh", "-c", "exit 0"], probe_argv
+        assert len(executed) == 1, "payload must really run (exit 0) on the host, not just be spelled right"
 
     @pytest.mark.linux_only
     def test_systemd_scope_first_probe_is_serialized(self, monkeypatch):
diff --git a/tools/process_registry.py b/tools/process_registry.py
index 5c1b1a2cb7..33338c0b3d 100644
--- a/tools/process_registry.py
+++ b/tools/process_registry.py
@@ -209,10 +209,8 @@ def _systemd_run_user_scope_available() -> bool:
     the user D-Bus bus even with the binary on PATH (every spawn would fail with
     ``Failed to connect to user bus``), so a cheap probe is run and cached.
 
-    The probe payload is ``/bin/sh -c 'exit 0'`` rather than ``/bin/true``: NixOS has
-    no FHS ``/bin`` (only ``sh``), so an absolute ``/bin/true`` probe fails there for a
-    reason unrelated to scope availability and disables restart-safe cron dispatch on
-    every scheduled fire (#105365).``"""
+    Use ``/bin/sh -c 'exit 0'``: NixOS provides ``/bin/sh`` but not ``/bin/true``
+    (#105365), regardless of the gateway service's PATH."""
     global _SYSTEMD_SCOPE_AVAILABLE, _SYSTEMD_SCOPE_PROBED_AT
     verdict = _systemd_scope_cached()
     if verdict is not None: