966959da08
Review follow-up on the Windows .cmd fix: the only always-on test drove the `_native_binary_candidates` helper directly, so reverting the production wiring (`_existing_binary` probing npm's bin dir, wrapper-first order, `_spawn_pyright` keeping the resolved suffix) stayed green on every non-Windows lane. `is_windows` is now threaded as data through `_first_existing`/`_existing_binary` (no sys.platform patch), and the test drives the production entry over an npm-shaped staging tree (POSIX shim + `.cmd` pair under `lsp/node_modules/.bin`) and asserts `_spawn_pyright` picks `pyright-langserver.cmd` when handed `pyright.cmd`. Each of the three wiring reverts turns it red; the windows_only live test stays as-is.
58 lines
2.7 KiB
Python
58 lines
2.7 KiB
Python
"""Windows binary resolution must prefer the runnable ``.cmd``/``.exe``/``.bat`` wrapper over npm's
|
|
POSIX ``#!/bin/sh`` shim, which shares the bare name and fails ``CreateProcess`` with WinError 193."""
|
|
|
|
import os
|
|
import subprocess
|
|
from pathlib import Path
|
|
|
|
import pytest
|
|
|
|
from agent.lsp import install, servers
|
|
|
|
|
|
def _npm_shim_pair(bin_dir: Path, name: str) -> Path:
|
|
"""npm's Windows layout: POSIX shim under the bare name, runnable ``.cmd`` beside it (both X_OK)."""
|
|
bin_dir.mkdir(parents=True, exist_ok=True)
|
|
shim = bin_dir / name
|
|
shim.write_text("#!/bin/sh\nexec node \"$0.js\" \"$@\"\n", encoding="utf-8")
|
|
cmd = bin_dir / f"{name}.cmd"
|
|
cmd.write_text("@echo off\r\necho wrapper-ran\r\n", encoding="utf-8")
|
|
for p in (shim, cmd):
|
|
os.chmod(p, 0o755)
|
|
return cmd
|
|
|
|
|
|
def test_windows_resolution_picks_cmd_wrapper_from_npm_bin_over_posix_shim(tmp_path: Path, monkeypatch):
|
|
"""Drives the production entry with ``is_windows`` as data (no sys.platform patch): the pair
|
|
lives where npm leaves it (``lsp/node_modules/.bin``), and pyright's langserver sibling keeps
|
|
the resolved suffix instead of falling onto the bare shim."""
|
|
monkeypatch.setattr(install, "hermes_lsp_bin_dir", lambda: tmp_path / "bin")
|
|
(tmp_path / "bin").mkdir()
|
|
cmd = _npm_shim_pair(tmp_path / "node_modules" / ".bin", "tool")
|
|
|
|
assert install._existing_binary("tool", is_windows=True) == str(cmd)
|
|
# POSIX resolution never looks in npm's bin dir and never appends wrappers.
|
|
assert install._existing_binary("tool", is_windows=False) is None
|
|
|
|
pyright_cmd = _npm_shim_pair(tmp_path / "node_modules" / ".bin", "pyright")
|
|
langserver_cmd = _npm_shim_pair(tmp_path / "node_modules" / ".bin", "pyright-langserver")
|
|
ctx = servers.ServerContext(workspace_root=str(tmp_path), binary_overrides={"pyright": [str(pyright_cmd)]})
|
|
spec = servers._spawn_pyright(str(tmp_path), ctx)
|
|
assert spec is not None and spec.command[0] == str(langserver_cmd)
|
|
|
|
|
|
@pytest.mark.windows_only
|
|
def test_existing_binary_resolves_runnable_cmd_over_posix_shim(tmp_path: Path, monkeypatch):
|
|
"""Live: staging dir holds npm's shim AND its .cmd; the resolved path must actually run."""
|
|
monkeypatch.setattr(install, "hermes_lsp_bin_dir", lambda: tmp_path)
|
|
shim = tmp_path / "tool"
|
|
shim.write_text("#!/bin/sh\nexec node \"$0.js\" \"$@\"\n", encoding="utf-8")
|
|
(tmp_path / "tool.cmd").write_text("@echo off\r\necho wrapper-ran\r\n", encoding="utf-8")
|
|
|
|
resolved = install._existing_binary("tool")
|
|
|
|
assert resolved == str(tmp_path / "tool.cmd")
|
|
out = subprocess.run([str(resolved)], capture_output=True, text=True, encoding="utf-8", errors="replace",
|
|
check=True, stdin=subprocess.DEVNULL)
|
|
assert "wrapper-ran" in out.stdout
|