test(channelbridge): 窗口夹具按截止时刻推钟 + 去掉无法证实的替身锁（M33 r1 复审）
P1-1（channelbridge 的 -race 门仍红，红在用例不确定性而不是竞态）： - coalesceTimers 改成**截止时刻**语义：每次 after(d) 记 at = 注入时钟 + d， 推钟只把时钟推进到「当前最早的截止时刻」再触发它。旧写法按 FIFO 逐个触发并 按请求时长累加，实测 12 条消息内攒到 5 个废弃定时器把时钟推 +10s（窗口 2s、 绝对上限 6s）⇒ 循环头走「到点直接发车、不 takeAll」的分支，队列尾部落到下一批。 - 推钟前强制「车道排空」这条不变量（pump/advanceAndFire/waitIdle）： 时钟只表示时间过去，它一转就可能跳过 takeAll，因此先等 worker 把货收进本批。 - sendSettled：投递后按**序号**等「这次投递之后新挂的定时器」（旧的都已被 worker 放弃、再没人监听），供「投递与推钟交替」的用例（每 500ms 一条的绝对上限用例）。 - fireLatest/advanceAndFire 带 done 谓词重试，避免「登记与触发之间续臂」导致 推了钟却没人醒；waitIdle 一边等一边推窗口（worker 停在窗口里时永远走不到退休）。 - 用例侧只补相位与等待，不动断言：TwelveBurst 读历史前等 assistant 行落库； 准入用例断言「最新一次续臂」（原来按下标取 d[1]，隐含臂数假设）； stale 用例两条都投完再推时钟（车道不会在两条之间退休）。 P2-1（替身锁无法用变异证实）选 A：删掉 stubChatter/stubSessions 的锁与访问器， 退回原字段访问，并写清理由 —— 21 个用例全走同步便捷路径 （b.process → processFrom → runBatch → Loop.Run），DEV HEAD 上 -race 数十次跑 （含把锁删掉的变异）DATA RACE 恒为 0；若将来从车道 worker 触碰这些字段必须加锁 并补 -race 用例。 证据：go test -race -count=3 ./internal/services/channelbridge/ 连跑 6 轮 18/18 全绿、DATA RACE=0；coalesce 子集 -count=80 全绿；整包 -race -count=20 全绿； 全树 go build/vet/test -count=1 全绿。
This commit is contained in:
AskaEth committed
1 parent
7d9b2132bb
commit
1ae9158250
20 files changed
+584
-371
No files matched your search
@@ -64,8 +64,8 @@ func TestNonOwnerSilencedRegisteredOnly(t *testing.T) {
|
||||
// 它只登记到隔离会话日志，绝不驱动循环。
|
||||
b.process(context.Background(), nonOwnerGroupMsg("hello all"))
|
||||
|
||||
if chat.SessionID() != "" || len(chat.Messages()) != 0 {
|
||||
t.Fatalf("loop ran for a no-signal non-owner message: session=%q messages=%+v", chat.SessionID(), chat.Messages())
|
||||
if chat.sessionID != "" || len(chat.messages) != 0 {
|
||||
t.Fatalf("loop ran for a no-signal non-owner message: session=%q messages=%+v", chat.sessionID, chat.messages)
|
||||
}
|
||||
recs := hist.records()
|
||||
if len(recs) != 1 {
|
||||
@@ -94,19 +94,19 @@ func TestNonOwnerMentionResponds(t *testing.T) {
|
||||
// 针对隔离群会话驱动完整循环。
|
||||
b.process(context.Background(), nonOwnerGroupMsg("hello", adapter.Mention{UserID: "bot"}))
|
||||
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want isolated sess-g", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want isolated sess-g", chat.sessionID)
|
||||
}
|
||||
// 受限群上下文 → 第三方边界系统消息加上
|
||||
// 用户消息（design/16 §4.6 §1），与 TestGroupMessageThirdPartySenderNameAndBoundary 一致。
|
||||
if len(chat.Messages()) != 2 || chat.Messages()[1].Role != model.RoleUser {
|
||||
t.Fatalf("loop messages = %+v, want boundary + user", chat.Messages())
|
||||
if len(chat.messages) != 2 || chat.messages[1].Role != model.RoleUser {
|
||||
t.Fatalf("loop messages = %+v, want boundary + user", chat.messages)
|
||||
}
|
||||
if chat.Messages()[1].Content[0].Text != "hello" {
|
||||
t.Fatalf("loop user text = %q, want undecorated 'hello'", chat.Messages()[1].Content[0].Text)
|
||||
if chat.messages[1].Content[0].Text != "hello" {
|
||||
t.Fatalf("loop user text = %q, want undecorated 'hello'", chat.messages[1].Content[0].Text)
|
||||
}
|
||||
if !strings.Contains(chat.Messages()[0].Content[0].Text, "群「Gang」") {
|
||||
t.Fatalf("origin/boundary system = %q, want group Gang", chat.Messages()[0].Content[0].Text)
|
||||
if !strings.Contains(chat.messages[0].Content[0].Text, "群「Gang」") {
|
||||
t.Fatalf("origin/boundary system = %q, want group Gang", chat.messages[0].Content[0].Text)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -132,7 +132,7 @@ func memberLaneBridge(t *testing.T, chat *stubChatter, hist *captureHistory) *Br
|
||||
// 「`Mentions` 非空」当「在叫她」。判据现在与 owner 车道同一份
|
||||
// （`ownerAddressedToMe`）：**指向她本人**（@她 / @全体）才必回。
|
||||
//
|
||||
// 「必不必回」用「完整循环有没有被驱动」（chat.SessionID()）判定；
|
||||
// 「必不必回」用「完整循环有没有被驱动」（chat.sessionID）判定；
|
||||
// 「不回」还必须是**登记但不回**（历史里恰好一条 user 记录），而不是消息被丢掉。
|
||||
//
|
||||
// 变异自证（把判据换回旧的 `if len(msg.Mentions) > 0`）：
|
||||
@@ -208,8 +208,8 @@ func TestMemberLaneAddressedToHerCriterion(t *testing.T) {
|
||||
|
||||
b.process(context.Background(), tc.msg())
|
||||
|
||||
if got := chat.SessionID() != ""; got != tc.wantReply {
|
||||
t.Fatalf("循环被驱动 = %v, want %v（session=%q）", got, tc.wantReply, chat.SessionID())
|
||||
if got := chat.sessionID != ""; got != tc.wantReply {
|
||||
t.Fatalf("循环被驱动 = %v, want %v（session=%q）", got, tc.wantReply, chat.sessionID)
|
||||
}
|
||||
if !tc.wantReply && len(hist.records()) != tc.wantRecords {
|
||||
t.Fatalf("records = %d, want %d（只登记不回，不是丢掉）", len(hist.records()), tc.wantRecords)
|
||||
@@ -237,8 +237,8 @@ func TestMemberLaneUnwiredChannelKeepsMentionFallback(t *testing.T) {
|
||||
|
||||
b.process(context.Background(), m)
|
||||
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("未接线渠道的群提及未回退到旧判据：session=%q", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("未接线渠道的群提及未回退到旧判据：session=%q", chat.sessionID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -257,8 +257,8 @@ func TestNonOwnerHighValueKeywordResponds(t *testing.T) {
|
||||
|
||||
// 高价值关键词（求助）即使没有 @ 也值得回复（策略二）。
|
||||
b.process(context.Background(), nonOwnerGroupMsg("有人在吗，紧急求助"))
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want isolated sess-g for a high-value keyword", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want isolated sess-g for a high-value keyword", chat.sessionID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -292,8 +292,8 @@ func TestNonOwnerQuietHoursRulesDoNotSilenceGroup(t *testing.T) {
|
||||
if !judge.last.InQuietHours {
|
||||
t.Fatalf("light judge InQuietHours = false, want true at 02:00（安静时段信号失真）")
|
||||
}
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g（轻思考说回就该回）", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g（轻思考说回就该回）", chat.sessionID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -316,8 +316,8 @@ func TestNonOwnerQuietHoursMentionResponds(t *testing.T) {
|
||||
|
||||
// 策略二：被直接点名的消息在安静时段仍会得到回复。
|
||||
b.process(context.Background(), nonOwnerGroupMsg("在吗", adapter.Mention{UserID: "bot"}))
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g (mention should break quiet-hours silence)", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g (mention should break quiet-hours silence)", chat.sessionID)
|
||||
}
|
||||
if judge.calls != 0 {
|
||||
t.Fatalf("light judge calls = %d, want 0（@ 是规则可直接判定的强信号）", judge.calls)
|
||||
@@ -342,8 +342,8 @@ func TestNonOwnerQuietHoursKeywordResponds(t *testing.T) {
|
||||
}
|
||||
|
||||
b.process(context.Background(), nonOwnerGroupMsg("有人在吗，紧急求助"))
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g (keyword should break quiet-hours silence)", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g (keyword should break quiet-hours silence)", chat.sessionID)
|
||||
}
|
||||
if judge.calls != 0 {
|
||||
t.Fatalf("light judge calls = %d, want 0（高价值关键词是规则可直接判定的强信号）", judge.calls)
|
||||
@@ -371,8 +371,8 @@ func TestOwnerUnaffectedInQuietHours(t *testing.T) {
|
||||
// 并回复。
|
||||
b.process(context.Background(), directMessage())
|
||||
|
||||
if chat.SessionID() != history.MainSessionID {
|
||||
t.Fatalf("owner loop session = %q, want %q", chat.SessionID(), history.MainSessionID)
|
||||
if chat.sessionID != history.MainSessionID {
|
||||
t.Fatalf("owner loop session = %q, want %q", chat.sessionID, history.MainSessionID)
|
||||
}
|
||||
if len(ad.sends) != 1 || ad.sends[0].Content != "主人好" {
|
||||
t.Fatalf("owner reply = %+v, want '主人好'", ad.sends)
|
||||
@@ -400,8 +400,8 @@ func TestLightJudgeConsultedWhenInconclusive(t *testing.T) {
|
||||
if judge.calls != 1 {
|
||||
t.Fatalf("light judge calls = %d, want 1 (inconclusive rules escalated)", judge.calls)
|
||||
}
|
||||
if chat.SessionID() != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g (judge said respond)", chat.SessionID())
|
||||
if chat.sessionID != "sess-g" {
|
||||
t.Fatalf("loop session = %q, want sess-g (judge said respond)", chat.sessionID)
|
||||
}
|
||||
}
|
||||
|
||||
@@ -425,8 +425,8 @@ func TestLightJudgeSilenceIsRespected(t *testing.T) {
|
||||
if judge.calls != 1 {
|
||||
t.Fatalf("light judge calls = %d, want 1", judge.calls)
|
||||
}
|
||||
if chat.SessionID() != "" {
|
||||
t.Fatalf("loop ran after the judge said silence: session=%q", chat.SessionID())
|
||||
if chat.sessionID != "" {
|
||||
t.Fatalf("loop ran after the judge said silence: session=%q", chat.sessionID)
|
||||
}
|
||||
if len(hist.records()) != 1 {
|
||||
t.Fatalf("records = %d, want 1 (registered, no reply)", len(hist.records()))
|
||||
@@ -454,8 +454,8 @@ func TestLightJudgeErrorFailsClosedToSilence(t *testing.T) {
|
||||
if judge.calls != 1 {
|
||||
t.Fatalf("light judge calls = %d, want 1", judge.calls)
|
||||
}
|
||||
if chat.SessionID() != "" || len(chat.Messages()) != 0 {
|
||||
t.Fatalf("loop ran after judge error: session=%q messages=%+v", chat.SessionID(), chat.Messages())
|
||||
if chat.sessionID != "" || len(chat.messages) != 0 {
|
||||
t.Fatalf("loop ran after judge error: session=%q messages=%+v", chat.sessionID, chat.messages)
|
||||
}
|
||||
if len(hist.records()) != 1 {
|
||||
t.Fatalf("records = %d, want 1 (registered, no reply)", len(hist.records()))
|
||||
|
||||
Reference in new issue
Block a user