Skip to content

Commit e2fbce4

Browse files
committed
fix(tests): require a real HTTP status line for service readiness
Signed-off-by: ELi Ma <eli@patch.sh>
1 parent c7021c0 commit e2fbce4

8 files changed

Lines changed: 266 additions & 13 deletions

File tree

‎Cargo.lock‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Cargo.toml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "mega2"
3-
version = "0.42.61"
3+
version = "0.42.62"
44
edition = "2024"
55
license = "MIT OR Apache-2.0"
66
description = "Monorepo engine and Git hosting server for AI agents: trunk-based storage, Git Smart HTTP, Git LFS, OCI registry, and Agent Session Capture"

‎docs/plan/README.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
> **最新事实前沿(2026-10-23 FIX-MTR-09登记;FIX-MTR-06完整C受阻):** FIX-MTR-06 最终树 `c7021c0` 的 A 组已实际复跑通过(VER-1/2/3/5=4/13/4/7,全 exit0),fmt、strict clippy、`cargo build`、`cargo build --tests` 均 exit0,ER-05 真实 Claude 与隔离 Codex 对同一冻结输入均 `VERDICT: PASS`。唯一未闭合的是 `source .env.test && cargo test --all`:`integration_api_write_trunk` 在 4 次真实运行中分别以不同用例在 seed clone 阶段 `Couldn't connect to server` 失败,失败用例的服务 stdout 仍停在 migration、`ss -ltnp sport=:<port>` 无监听者,根因为测试就绪探针把其它测试端口分配器短暂 `listen` 的端口当作服务就绪。按 ER-03 登记 `FIX-MTR-09`(测试 harness readiness 更正,独立 patch/self C-D,prod-files=0),FIX-MTR-06 保持 in-progress:须先取得 09 的 C/D,再以新树重跑 06 的完整 C 后才可 done/complete。计划总数 Mega 110(活动 109)、Libra 26(活动 25)、联合 136(活动 134),完成数仍为 Mega 6/110。旧 FAIL/STOP/取消/预算与缺失原件按各自时点保留;FIX06 的 AC/VER 不因该环境缺陷被标记完成。
2+
13
> **最新事实前沿(2026-10-22 22:47:54 UTC为本轮事实正式写入起始秒,实际apply收据 `/tmp/fix06_A_smoke_final_fact_apply_actual_20261023/receipt.json`):** FIX06批量生产实现及测试已应用,累计24个新增测试、当前批量来源新增13个;正式8AC/8VER及canonical限定不变。执行合同R3 actual70980/exit0/chunk7b76dc为真实Claude/Codex双PASS(含VER2_MAPPING),仅合同资格;新产品A actual13933/exit0/chunk7bb0e2十门真实通过:fmt/clippy/release各exit0,VER1/2/3/5分别4/13/4/7通过,VER6_7_capture另1通过,traces24,api433通过/1原ignored。84次native查询,32次清理信号发送有完整journal,remaining_owned={}。root已具名判定当前源码VER4/6/7/8手工证据PASS,VER2+VER5跨选择器映射按两门实际通过共同消费。新smoke执行合同86711/exit0/chunkcd70d8真实Claude/Codex双PASS;产品smoke81644/exit0/chunk7be561实际18通过、0失败,runtime OpenAPI HTTP200/3.1.0/30 paths,7个owned containers和10项fixture清理成功,host清理0信号/0错误、remaining_owned={}。本次事实同步B、自身ER05、完整C/D及提交/推送/版本发布仍未完成。 A与手工原件位置见Mega2 FIX-MTR-06 Current evidence;旧FAIL/STOP/缺失/取消和各历史pending原文保留,不能回填为当时通过。AC勾选、Lifecycle/Acceptance、Dependencies/I/R/独立发布边界不改;Libra13本地文档不提前push,MTR95仍独立阻塞。
24

35
> **执行事实更新(2026-10-22 22:01:45 UTC,本次写入时点):** FIX06批量源码及测试已应用,实际产品A尚未启动。执行合同R1 session92123/exit1与R2 session24301/exit1均为Claude PASS、Codex FAIL;R2确认两项P1关闭,清理journal及独立观察连接P2正在前滚修复,未以评审次数耗尽停止。前两次准备实际64055/78353共扣72秒,原首个A claim未创建,后续准备继续累计;旧FAIL/STOP与FIX3/LTR00取消不变。VER2的owner预占零tree证据明确由VER5具名用例补充,必须两门真实通过;此映射澄清待下一轮双审,8AC/8VER、原命令/覆盖/期限、依赖与发布边界均不变。H0既成PASS仅为计划采纳;FIX06新A/自身ER05/C/D、提交与推送均未完成,Libra13笔本地文档不得提前push,MTR95独立阻塞保留。R2原件 `/tmp/fix06_batch_A_execution_review_r2_20261023/root-terminal.json` SHA `ca767f9eaaad960097ca08b1b42598276f80c7056c010dd48b837c8e3d6cedf0`。

‎docs/plan/plan-20261015.md‎

Lines changed: 78 additions & 4 deletions
Large diffs are not rendered by default.

‎docs/plan/plan-long.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
> **最新事实前沿(2026-10-23 FIX-MTR-09登记;FIX-MTR-06完整C受阻):** FIX-MTR-06 最终树 `c7021c0` 的 A 组已实际复跑通过(VER-1/2/3/5=4/13/4/7,全 exit0),fmt、strict clippy、`cargo build`、`cargo build --tests` 均 exit0,ER-05 真实 Claude 与隔离 Codex 对同一冻结输入均 `VERDICT: PASS`。唯一未闭合的是 `source .env.test && cargo test --all`:`integration_api_write_trunk` 在 4 次真实运行中分别以不同用例在 seed clone 阶段 `Couldn't connect to server` 失败,失败用例的服务 stdout 仍停在 migration、`ss -ltnp sport=:<port>` 无监听者,根因为测试就绪探针把其它测试端口分配器短暂 `listen` 的端口当作服务就绪。按 ER-03 登记 `FIX-MTR-09`(测试 harness readiness 更正,独立 patch/self C-D,prod-files=0),FIX-MTR-06 保持 in-progress:须先取得 09 的 C/D,再以新树重跑 06 的完整 C 后才可 done/complete。计划总数 Mega 110(活动 109)、Libra 26(活动 25)、联合 136(活动 134),完成数仍为 Mega 6/110。旧 FAIL/STOP/取消/预算与缺失原件按各自时点保留;FIX06 的 AC/VER 不因该环境缺陷被标记完成。
2+
13
> **最新事实前沿(2026-10-22 22:47:54 UTC为本轮事实正式写入起始秒,实际apply收据 `/tmp/fix06_A_smoke_final_fact_apply_actual_20261023/receipt.json`):** FIX06批量生产实现及测试已应用,累计24个新增测试、当前批量来源新增13个;正式8AC/8VER及canonical限定不变。执行合同R3 actual70980/exit0/chunk7b76dc为真实Claude/Codex双PASS(含VER2_MAPPING),仅合同资格;新产品A actual13933/exit0/chunk7bb0e2十门真实通过:fmt/clippy/release各exit0,VER1/2/3/5分别4/13/4/7通过,VER6_7_capture另1通过,traces24,api433通过/1原ignored。84次native查询,32次清理信号发送有完整journal,remaining_owned={}。root已具名判定当前源码VER4/6/7/8手工证据PASS,VER2+VER5跨选择器映射按两门实际通过共同消费。新smoke执行合同86711/exit0/chunkcd70d8真实Claude/Codex双PASS;产品smoke81644/exit0/chunk7be561实际18通过、0失败,runtime OpenAPI HTTP200/3.1.0/30 paths,7个owned containers和10项fixture清理成功,host清理0信号/0错误、remaining_owned={}。本次事实同步B、自身ER05、完整C/D及提交/推送/版本发布仍未完成。 A与手工原件位置见Mega2 FIX-MTR-06 Current evidence;旧FAIL/STOP/缺失/取消和各历史pending原文保留,不能回填为当时通过。AC勾选、Lifecycle/Acceptance、Dependencies/I/R/独立发布边界不改;Libra13本地文档不提前push,MTR95仍独立阻塞。
24

35
> **执行事实更新(2026-10-22 22:01:45 UTC,本次写入时点):** FIX06批量源码及测试已应用,实际产品A尚未启动。执行合同R1 session92123/exit1与R2 session24301/exit1均为Claude PASS、Codex FAIL;R2确认两项P1关闭,清理journal及独立观察连接P2正在前滚修复,未以评审次数耗尽停止。前两次准备实际64055/78353共扣72秒,原首个A claim未创建,后续准备继续累计;旧FAIL/STOP与FIX3/LTR00取消不变。VER2的owner预占零tree证据明确由VER5具名用例补充,必须两门真实通过;此映射澄清待下一轮双审,8AC/8VER、原命令/覆盖/期限、依赖与发布边界均不变。H0既成PASS仅为计划采纳;FIX06新A/自身ER05/C/D、提交与推送均未完成,Libra13笔本地文档不得提前push,MTR95独立阻塞保留。R2原件 `/tmp/fix06_batch_A_execution_review_r2_20261023/root-terminal.json` SHA `ca767f9eaaad960097ca08b1b42598276f80c7056c010dd48b837c8e3d6cedf0`。

‎docs/plan/plan-status.md‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
> **最新事实前沿(2026-10-23 FIX-MTR-09登记;FIX-MTR-06完整C受阻):** FIX-MTR-06 最终树 `c7021c0` 的 A 组已实际复跑通过(VER-1/2/3/5=4/13/4/7,全 exit0),fmt、strict clippy、`cargo build`、`cargo build --tests` 均 exit0,ER-05 真实 Claude 与隔离 Codex 对同一冻结输入均 `VERDICT: PASS`。唯一未闭合的是 `source .env.test && cargo test --all`:`integration_api_write_trunk` 在 4 次真实运行中分别以不同用例在 seed clone 阶段 `Couldn't connect to server` 失败,失败用例的服务 stdout 仍停在 migration、`ss -ltnp sport=:<port>` 无监听者,根因为测试就绪探针把其它测试端口分配器短暂 `listen` 的端口当作服务就绪。按 ER-03 登记 `FIX-MTR-09`(测试 harness readiness 更正,独立 patch/self C-D,prod-files=0),FIX-MTR-06 保持 in-progress:须先取得 09 的 C/D,再以新树重跑 06 的完整 C 后才可 done/complete。计划总数 Mega 110(活动 109)、Libra 26(活动 25)、联合 136(活动 134),完成数仍为 Mega 6/110。旧 FAIL/STOP/取消/预算与缺失原件按各自时点保留;FIX06 的 AC/VER 不因该环境缺陷被标记完成。
2+
13
> **最新事实前沿(2026-10-22 22:47:54 UTC为本轮事实正式写入起始秒,实际apply收据 `/tmp/fix06_A_smoke_final_fact_apply_actual_20261023/receipt.json`):** FIX06批量生产实现及测试已应用,累计24个新增测试、当前批量来源新增13个;正式8AC/8VER及canonical限定不变。执行合同R3 actual70980/exit0/chunk7b76dc为真实Claude/Codex双PASS(含VER2_MAPPING),仅合同资格;新产品A actual13933/exit0/chunk7bb0e2十门真实通过:fmt/clippy/release各exit0,VER1/2/3/5分别4/13/4/7通过,VER6_7_capture另1通过,traces24,api433通过/1原ignored。84次native查询,32次清理信号发送有完整journal,remaining_owned={}。root已具名判定当前源码VER4/6/7/8手工证据PASS,VER2+VER5跨选择器映射按两门实际通过共同消费。新smoke执行合同86711/exit0/chunkcd70d8真实Claude/Codex双PASS;产品smoke81644/exit0/chunk7be561实际18通过、0失败,runtime OpenAPI HTTP200/3.1.0/30 paths,7个owned containers和10项fixture清理成功,host清理0信号/0错误、remaining_owned={}。本次事实同步B、自身ER05、完整C/D及提交/推送/版本发布仍未完成。 A与手工原件位置见Mega2 FIX-MTR-06 Current evidence;旧FAIL/STOP/缺失/取消和各历史pending原文保留,不能回填为当时通过。AC勾选、Lifecycle/Acceptance、Dependencies/I/R/独立发布边界不改;Libra13本地文档不提前push,MTR95仍独立阻塞。
24

35
> **执行事实更新(2026-10-22 22:01:45 UTC,本次写入时点):** FIX06批量源码及测试已应用,实际产品A尚未启动。执行合同R1 session92123/exit1与R2 session24301/exit1均为Claude PASS、Codex FAIL;R2确认两项P1关闭,清理journal及独立观察连接P2正在前滚修复,未以评审次数耗尽停止。前两次准备实际64055/78353共扣72秒,原首个A claim未创建,后续准备继续累计;旧FAIL/STOP与FIX3/LTR00取消不变。VER2的owner预占零tree证据明确由VER5具名用例补充,必须两门真实通过;此映射澄清待下一轮双审,8AC/8VER、原命令/覆盖/期限、依赖与发布边界均不变。H0既成PASS仅为计划采纳;FIX06新A/自身ER05/C/D、提交与推送均未完成,Libra13笔本地文档不得提前push,MTR95独立阻塞保留。R2原件 `/tmp/fix06_batch_A_execution_review_r2_20261023/root-terminal.json` SHA `ca767f9eaaad960097ca08b1b42598276f80c7056c010dd48b837c8e3d6cedf0`。

‎tests/integration_api_write_trunk.rs‎

Lines changed: 173 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ mod git_cli;
1717

1818
use std::{
1919
fs,
20-
io::Read,
20+
io::{Read, Write},
2121
net::TcpStream,
2222
path::{Path, PathBuf},
2323
process::{Child, Command, ExitStatus, Stdio},
@@ -234,6 +234,78 @@ fn is_service_tcp_connection(stream: &TcpStream) -> bool {
234234
)
235235
}
236236

237+
/// A bare TCP accept is not readiness: another test's port allocator briefly
238+
/// `listen`s on a port it already claimed and then drops it, so a successful
239+
/// `connect` can belong to a stranger that never answers HTTP. Only a peer that
240+
/// replies with an HTTP/1.x status line can be this test's own service.
241+
fn is_service_http_ready(port: u16, deadline: Instant) -> bool {
242+
let remaining = || {
243+
let now = Instant::now();
244+
(now < deadline).then(|| deadline - now)
245+
};
246+
let Some(connect_budget) = remaining() else {
247+
return false;
248+
};
249+
let address = std::net::SocketAddr::from(([127, 0, 0, 1], port));
250+
let Ok(mut stream) =
251+
TcpStream::connect_timeout(&address, connect_budget.min(Duration::from_secs(2)))
252+
else {
253+
return false;
254+
};
255+
if !is_service_tcp_connection(&stream) {
256+
return false;
257+
}
258+
let Some(write_budget) = remaining() else {
259+
return false;
260+
};
261+
let _ = stream.set_write_timeout(Some(write_budget.min(Duration::from_secs(2))));
262+
let request = format!("GET / HTTP/1.1\r\nHost: 127.0.0.1:{port}\r\nConnection: close\r\n\r\n");
263+
if stream.write_all(request.as_bytes()).is_err() {
264+
return false;
265+
}
266+
// Read one bounded status line instead of a fixed prefix: a stranger that
267+
// sends just `HTTP/` and closes must not be accepted as the service. Every
268+
// read is bounded by the remaining startup budget so a slow drip cannot
269+
// stretch one probe past the caller's deadline.
270+
let mut status = Vec::with_capacity(64);
271+
let mut byte = [0u8; 1];
272+
while status.len() < 64 {
273+
let Some(read_budget) = remaining() else {
274+
return false;
275+
};
276+
let _ = stream.set_read_timeout(Some(read_budget.min(Duration::from_secs(2))));
277+
match stream.read(&mut byte) {
278+
Ok(1) => {
279+
status.push(byte[0]);
280+
if byte[0] == b'\n' {
281+
break;
282+
}
283+
}
284+
_ => return false,
285+
}
286+
}
287+
status_line_is_http(&status)
288+
}
289+
290+
/// `HTTP/1.x` + exactly three status digits, terminated by a line break.
291+
fn status_line_is_http(status: &[u8]) -> bool {
292+
let Some(line) = status.strip_suffix(b"\n") else {
293+
return false;
294+
};
295+
let line = line.strip_suffix(b"\r").unwrap_or(line);
296+
let Ok(line) = std::str::from_utf8(line) else {
297+
return false;
298+
};
299+
let Some((version, rest)) = line.split_once(' ') else {
300+
return false;
301+
};
302+
if version != "HTTP/1.0" && version != "HTTP/1.1" {
303+
return false;
304+
}
305+
let code = rest.split(' ').next().unwrap_or_default();
306+
code.len() == 3 && code.bytes().all(|b| b.is_ascii_digit())
307+
}
308+
237309
#[cfg(target_os = "linux")]
238310
fn self_connected_tcp_probe() -> TcpStream {
239311
with_runtime(async {
@@ -261,6 +333,105 @@ fn service_readiness_rejects_tcp_self_connection() {
261333
assert!(!is_service_tcp_connection(&stream));
262334
}
263335

336+
#[test]
337+
fn service_readiness_rejects_non_http_listener() {
338+
let listener = std::net::TcpListener::bind(("127.0.0.1", 0)).unwrap();
339+
let port = listener.local_addr().unwrap().port();
340+
let started = Instant::now();
341+
assert!(
342+
!is_service_http_ready(port, Instant::now() + Duration::from_millis(300)),
343+
"a listener that never answers HTTP must not count as service readiness"
344+
);
345+
assert!(started.elapsed() >= Duration::from_millis(250));
346+
drop(listener);
347+
}
348+
349+
#[test]
350+
fn service_readiness_accepts_http_responder() {
351+
let listener = std::net::TcpListener::bind(("127.0.0.1", 0)).unwrap();
352+
let port = listener.local_addr().unwrap().port();
353+
let handle = std::thread::spawn(move || {
354+
let mut stream = listener.accept().expect("accept readiness probe").0;
355+
let mut request = [0u8; 64];
356+
let _ = stream.read(&mut request);
357+
stream
358+
.write_all(b"HTTP/1.1 204 No Content\r\nContent-Length: 0\r\nConnection: close\r\n\r\n")
359+
.expect("answer readiness probe");
360+
});
361+
assert!(is_service_http_ready(
362+
port,
363+
Instant::now() + Duration::from_secs(2)
364+
));
365+
handle.join().expect("responder thread");
366+
}
367+
368+
#[test]
369+
fn service_readiness_rejects_truncated_http_prefix() {
370+
let listener = std::net::TcpListener::bind(("127.0.0.1", 0)).unwrap();
371+
let port = listener.local_addr().unwrap().port();
372+
let handle = std::thread::spawn(move || {
373+
let mut stream = listener.accept().expect("accept probe").0;
374+
let mut request = [0u8; 64];
375+
let _ = stream.read(&mut request);
376+
stream.write_all(b"HTTP/").expect("write prefix");
377+
});
378+
assert!(!is_service_http_ready(
379+
port,
380+
Instant::now() + Duration::from_secs(2)
381+
));
382+
handle.join().expect("prefix thread");
383+
}
384+
385+
#[test]
386+
fn service_readiness_rejects_malformed_status_line() {
387+
let listener = std::net::TcpListener::bind(("127.0.0.1", 0)).unwrap();
388+
let port = listener.local_addr().unwrap().port();
389+
let handle = std::thread::spawn(move || {
390+
let mut stream = listener.accept().expect("accept probe").0;
391+
let mut request = [0u8; 64];
392+
let _ = stream.read(&mut request);
393+
stream
394+
.write_all(b"HTTP/1.1 NOT_A_CODE Nope\r\n")
395+
.expect("write malformed status");
396+
});
397+
assert!(!is_service_http_ready(
398+
port,
399+
Instant::now() + Duration::from_secs(2)
400+
));
401+
handle.join().expect("malformed thread");
402+
}
403+
404+
#[test]
405+
fn service_readiness_rejects_slow_drip_status_line() {
406+
let listener = std::net::TcpListener::bind(("127.0.0.1", 0)).unwrap();
407+
let port = listener.local_addr().unwrap().port();
408+
let handle = std::thread::spawn(move || {
409+
let mut stream = listener.accept().expect("accept probe").0;
410+
let mut request = [0u8; 64];
411+
let _ = stream.read(&mut request);
412+
// Never finish the status line: the probe must stop at its own deadline
413+
// instead of granting every byte a fresh read timeout.
414+
for chunk in [b"H".as_slice(), b"T", b"T", b"P", b"/", b"1", b".", b"1"] {
415+
if stream.write_all(chunk).is_err() {
416+
break;
417+
}
418+
std::thread::sleep(Duration::from_millis(100));
419+
}
420+
std::thread::sleep(Duration::from_millis(500));
421+
});
422+
let started = Instant::now();
423+
assert!(!is_service_http_ready(
424+
port,
425+
Instant::now() + Duration::from_millis(400)
426+
));
427+
assert!(
428+
started.elapsed() < Duration::from_millis(1200),
429+
"probe must honour the cumulative deadline, took {:?}",
430+
started.elapsed()
431+
);
432+
handle.join().expect("slow drip thread");
433+
}
434+
264435
#[test]
265436
fn service_readiness_accepts_real_listener_connection() {
266437
let listener = std::net::TcpListener::bind(("127.0.0.1", 0)).unwrap();
@@ -295,9 +466,7 @@ impl ServiceProcess {
295466
) {
296467
let deadline = Instant::now() + timeout;
297468
loop {
298-
if TcpStream::connect(("127.0.0.1", port))
299-
.is_ok_and(|stream| is_service_tcp_connection(&stream))
300-
{
469+
if is_service_http_ready(port, deadline) {
301470
return;
302471
}
303472
if let Some(status) = self.child.try_wait().expect("poll service") {

‎tests/integration_storage_events_runtime.rs‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -343,9 +343,13 @@ fn integration_storage_events_runtime_http_sigint_clean_shutdown() {
343343
#[test]
344344
fn integration_storage_events_runtime_occupied_port_exits_through_cleanup() {
345345
let case = RuntimeCase::new();
346-
let port = reserve_free_port();
347-
// Hold the port so the service bind fails after AppContext creation.
348-
let _blocker = TcpListener::bind(("127.0.0.1", port)).expect("bind blocker port");
346+
// Hold the blocker first: its own listener is the only race-free source of
347+
// the port this test wants the service to fail to bind. Reserving a free
348+
// port and re-binding it later races with parallel tests in this binary.
349+
let blocker = TcpListener::bind(("127.0.0.1", 0)).expect("bind blocker port");
350+
let port = blocker.local_addr().expect("blocker local addr").port();
351+
// Keep the port occupied so the service bind fails after AppContext creation.
352+
let _blocker = blocker;
349353
let (stdout_path, stderr_path) = case.log_paths("http-occupied");
350354
let mut command = case.command();
351355
command.args([

0 commit comments

Comments
 (0)