Skip to content

Commit 8018f6c

Browse files
Rusty Conoverclaude
andcommitted
Fix the remaining Windows-only test failures
- check_duckdb2_manifest: hash LF-normalized audit bytes, so a CRLF checkout (or a fixture written with write_text on Windows) matches the manifest digest. LF files hash exactly as before. - test_demo_startup_rejects_an_occupied_port: skip on Windows. waitress sets SO_REUSEADDR, which on Windows lets a second listener bind an occupied port, so the child really does bind and become ready. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
1 parent e8212d6 commit 8018f6c

2 files changed

Lines changed: 6 additions & 1 deletion

File tree

‎scripts/check_duckdb2_manifest.py‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,8 @@ def check_inventory(manifest: dict[str, Any], native_root: Path) -> list[str]:
7979
source_path = native_root / manifest["sources"]["audit_path"]
8080
if not source_path.is_file():
8181
return [f"required audit source is missing: {source_path}"]
82-
source = source_path.read_bytes()
82+
# Hash LF-normalized bytes so a CRLF checkout (Windows) matches the manifest.
83+
source = source_path.read_bytes().replace(b"\r\n", b"\n")
8384
if hashlib.sha256(source).hexdigest() != manifest["sources"]["audit_sha256"]:
8485
errors.append("native audit digest changed; reconcile the manifest against the new evidence")
8586
rows = audit_rows(source.decode())

‎tests/test_http_demo_storage.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -414,6 +414,10 @@ def test_demo_servers_reserve_distinct_bound_ports() -> None:
414414
assert http_capabilities(base_url=second).max_upload_bytes == 16384
415415

416416

417+
@pytest.mark.skipif(
418+
sys.platform == "win32",
419+
reason="waitress sets SO_REUSEADDR, which on Windows lets a second listener bind an occupied port",
420+
)
417421
def test_demo_startup_rejects_an_occupied_port() -> None:
418422
"""An existing server cannot make a child that failed to bind look ready."""
419423
with _run_demo_http_server(threshold_bytes=8192) as first:

0 commit comments

Comments
 (0)