Skip to content

Commit 44fa3ae

Browse files
authored
Merge pull request #2026 from DeusData/fix/windows-guard-daemon-isolation
test(windows): isolate the daemon guards' rendezvous and stop hiding their failures
2 parents 3bbabf1 + 73f4a43 commit 44fa3ae

3 files changed

Lines changed: 168 additions & 63 deletions

File tree

‎tests/windows/test_cli_non_ascii_arg.py‎

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ def main():
7373
# (#1952). One retry against a fresh cache separates that from a real
7474
# CLI indexing failure.
7575
ctrl_out = ""
76+
ctrl_err = ""
7677
for attempt in ("cache_ascii", "cache_ascii_retry"):
7778
env = dict(os.environ)
7879
env["CBM_CACHE_DIR"] = os.path.join(work, attempt)
@@ -81,14 +82,19 @@ def main():
8182
json.dumps({"repo_path": ascii_repo})],
8283
capture_output=True, timeout=120, env=env)
8384
ctrl_out = (ctrl.stdout or b"").decode("utf-8", "replace")
85+
ctrl_err = (ctrl.stderr or b"").decode("utf-8", "replace")
8486
if '"nodes"' in ctrl_out:
8587
break
86-
print("SETUP: ASCII control attempt %r did not index via CLI:\n%s"
87-
% (attempt, ctrl_out[:300]))
88+
# Full stdout AND stderr: the reason lives on stderr (daemon
89+
# spawn/handshake diagnostics), and a head slice of stdout only
90+
# ever showed the allocator preamble.
91+
print("SETUP: ASCII control attempt %r did not index via CLI (rc=%s):\n"
92+
"stdout:\n%s\nstderr:\n%s"
93+
% (attempt, ctrl.returncode, ctrl_out, ctrl_err))
8894
time.sleep(2)
8995
if '"nodes"' not in ctrl_out:
90-
print("SETUP FAIL: ASCII control did not index via CLI:\n%s" %
91-
ctrl_out[:300])
96+
print("SETUP FAIL: ASCII control did not index via CLI:\nstdout:\n%s\nstderr:\n%s"
97+
% (ctrl_out, ctrl_err))
9298
return 2
9399

94100
env2 = dict(os.environ)

0 commit comments

Comments
 (0)