vultr/openclaw
1
0
Fork 0
mirror of https://github.com/openclaw/openclaw.git synced 2026-05-23 19:50:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

test: accept runtime matrix dm approvals

Browse Source
This commit is contained in:
Peter Steinberger
2026-05-17 15:58:07 +01:00
parent 833f1ce735
commit 543518bd43
2 changed files with 24 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
extensions/qa-matrix/src/runners/contract/scenario-runtime-approval.ts
View File

@@ -172,6 +172,7 @@ async function waitForObservedApprovalEvent(params: {
context: MatrixQaScenarioContext;
expectedApprovalId: string;
expectedKind: MatrixQaApprovalKind;
excludedRoomIds?: string[];
roomIds: string[];
timeoutMs: number;
}) {
@@ -183,16 +184,31 @@ async function waitForObservedApprovalEvent(params: {
if (!primaryRoomId) {
throw new Error("Matrix approval wait requires at least one candidate room");
}
const startedAt = Date.now();
while (Date.now() - startedAt < params.timeoutMs) {
const observedMatch = params.context.observedEvents.find((event) =>
const excludedRoomIds = new Set(params.excludedRoomIds ?? []);
const isExpectedObservedApproval = (event: MatrixQaObservedEvent) => {
if (excludedRoomIds.has(event.roomId)) {
return false;
}
if (
roomIds.some((roomId) =>
isExpectedApprovalEvent(event, {
...params,
roomId,
}),
),
)
) {
return true;
}
return (
event.sender === params.context.sutUserId &&
event.type === "m.room.message" &&
event.approval?.kind === params.expectedKind &&
event.approval.id === params.expectedApprovalId
);
};
const startedAt = Date.now();
while (Date.now() - startedAt < params.timeoutMs) {
const observedMatch = params.context.observedEvents.find(isExpectedObservedApproval);
if (observedMatch) {
assertApprovalMetadata({
event: observedMatch,
@@ -209,13 +225,7 @@ async function waitForObservedApprovalEvent(params: {
}
await client.waitForOptionalRoomEvent({
observedEvents: params.context.observedEvents,
predicate: (event) =>
roomIds.some((roomId) =>
isExpectedApprovalEvent(event, {
...params,
roomId,
}),
),
predicate: isExpectedObservedApproval,
roomId: primaryRoomId,
timeoutMs: Math.min(1_000, remainingMs),
});
@@ -674,6 +684,7 @@ export async function runApprovalChannelTargetBothScenario(context: MatrixQaScen
});
const dmApproval = await waitForObservedApprovalEvent({
context,
excludedRoomIds: [context.roomId],
expectedApprovalId: approvalId,
expectedKind: "exec",
roomIds: dmRoomIds,

4
extensions/qa-matrix/src/runners/contract/scenarios.test.ts
View File

@@ -720,7 +720,7 @@ describe("matrix live qa scenarios", () => {
const channelApproval = buildApprovalEvent("$approval-both-channel", "!main:matrix-qa.test");
const dmApproval = buildApprovalEvent(
"$approval-both-dm",
"!driver-shared-dm:matrix-qa.test",
"!driver-runtime-dm:matrix-qa.test",
);
context.observedEvents.push(channelApproval, dmApproval, {
eventId: "$approval-both-option",
@@ -757,7 +757,7 @@ describe("matrix live qa scenarios", () => {
expect(artifacts.approvals?.[0]?.eventId).toBe("$approval-both-channel");
expect(artifacts.approvals?.[0]?.roomId).toBe("!main:matrix-qa.test");
expect(artifacts.approvals?.[1]?.eventId).toBe("$approval-both-dm");
expect(artifacts.approvals?.[1]?.roomId).toBe("!driver-shared-dm:matrix-qa.test");
expect(artifacts.approvals?.[1]?.roomId).toBe("!driver-runtime-dm:matrix-qa.test");
expect(waitForRoomEvent).toHaveBeenCalledTimes(1);
const finalGatewayCall = mockCall(gatewayCall, "gatewayCall", -1);