In the test suite, correctly calculate if an SSH agent is isolated (ea42999) - derivepassphrase.git

In the test suite, correctly calculate if an SSH agent is isolated

Marco Ricci commited on 2025-12-27 18:42:06
Zeige 1 geänderte Dateien mit 5 Einfügungen und 1 Löschungen.

In particular, pay consideration to interfaced agents, not just spawned ones.

tests/conftest.py

Zeige Datei @ ea42999

@@ -699,7 +699,11 @@ def spawn_named_agent(  # noqa: C901
                 msg = f'agent failed the "list keys" sanity test: {exc!r}'
                 raise CannotSpawnError(msg) from exc
         yield data.SpawnedSSHAgentInfo(
-            agent_type, client, spawn_func is not spawn_noop
+            agent_type,
+            client,
+            spawn_func is not spawn_noop
+            if isinstance(proc_or_socket, subprocess.Popen)
+            else False,
         )
     assert os.environ.get("SSH_AUTH_SOCK", None) == startup_ssh_auth_sock, (
         f"SSH_AUTH_SOCK mismatch after tearing down {agent_name}"


...	...	@@ -699,7 +699,11 @@ def spawn_named_agent( # noqa: C901
699	699	msg = f'agent failed the "list keys" sanity test: {exc!r}'
700	700	raise CannotSpawnError(msg) from exc
701	701	yield data.SpawnedSSHAgentInfo(
702		- agent_type, client, spawn_func is not spawn_noop
	702	+ agent_type,
	703	+ client,
	704	+ spawn_func is not spawn_noop
	705	+ if isinstance(proc_or_socket, subprocess.Popen)
	706	+ else False,
703	707	)
704	708	assert os.environ.get("SSH_AUTH_SOCK", None) == startup_ssh_auth_sock, (
705	709	f"SSH_AUTH_SOCK mismatch after tearing down {agent_name}"
706	710