@@ -927,6 +927,19 @@ async function runMatrixToolProgressScenario(
927927event.relatesTo?.relType === "m.replace" &&
928928event.relatesTo.eventId === previewRootEventId &&
929929matchesExpectedProgress(event.body);
930+const throwProgressTimeout = (err: unknown, previewEventId: string): never => {
931+throw new Error(
932+buildMatrixQaToolProgressTimeoutMessage({
933+cause: err,
934+events: context.observedEvents,
935+expectedPreviewKind: params.expectedPreviewKind,
936+ previewEventId,
937+roomId: context.roomId,
938+startIndex: startObservedIndex,
939+sutUserId: context.sutUserId,
940+}),
941+);
942+};
930943const preview = await client
931944.waitForRoomEvent({
932945observedEvents: context.observedEvents,
@@ -940,19 +953,7 @@ async function runMatrixToolProgressScenario(
940953since: startSince,
941954timeoutMs: context.timeoutMs,
942955})
943-.catch((err: unknown) => {
944-throw new Error(
945-buildMatrixQaToolProgressTimeoutMessage({
946-cause: err,
947-events: context.observedEvents,
948-expectedPreviewKind: params.expectedPreviewKind,
949-previewEventId: "<not observed>",
950-roomId: context.roomId,
951-startIndex: startObservedIndex,
952-sutUserId: context.sutUserId,
953-}),
954-);
955-});
956+.catch((err: unknown) => throwProgressTimeout(err, "<not observed>"));
956957if (isFinalReply(preview.event)) {
957958if (
958959(params.allowFinalBeforeProgress === true ||
@@ -967,19 +968,7 @@ async function runMatrixToolProgressScenario(
967968since: preview.since,
968969timeoutMs: context.timeoutMs,
969970})
970-.catch((err: unknown) => {
971-throw new Error(
972-buildMatrixQaToolProgressTimeoutMessage({
973-cause: err,
974-events: context.observedEvents,
975-expectedPreviewKind: params.expectedPreviewKind,
976-previewEventId: "<not observed>",
977-roomId: context.roomId,
978-startIndex: startObservedIndex,
979-sutUserId: context.sutUserId,
980-}),
981-);
982-});
971+.catch((err: unknown) => throwProgressTimeout(err, "<not observed>"));
983972const progressPreviewEventId = getPreviewRootEventId(progressAfterFinal.event);
984973const unexpectedWorkingEvents = findMatrixQaUnexpectedWorkingEvents({
985974events: context.observedEvents,
@@ -1079,19 +1068,7 @@ async function runMatrixToolProgressScenario(
10791068since: preview.since,
10801069timeoutMs: context.timeoutMs,
10811070})
1082-.catch((err: unknown) => {
1083-throw new Error(
1084-buildMatrixQaToolProgressTimeoutMessage({
1085-cause: err,
1086-events: context.observedEvents,
1087-expectedPreviewKind: params.expectedPreviewKind,
1088-previewEventId: previewRootEventId,
1089-roomId: context.roomId,
1090-startIndex: startObservedIndex,
1091-sutUserId: context.sutUserId,
1092-}),
1093-);
1094-});
1071+.catch((err: unknown) => throwProgressTimeout(err, previewRootEventId));
10951072if (isFinalReply(progressOrFinal.event)) {
10961073topLevelFinalBeforeProgress = progressOrFinal;
10971074progress = await client
@@ -1102,19 +1079,7 @@ async function runMatrixToolProgressScenario(
11021079since: progressOrFinal.since,
11031080timeoutMs: context.timeoutMs,
11041081})
1105-.catch((err: unknown) => {
1106-throw new Error(
1107-buildMatrixQaToolProgressTimeoutMessage({
1108-cause: err,
1109-events: context.observedEvents,
1110-expectedPreviewKind: params.expectedPreviewKind,
1111-previewEventId: previewRootEventId,
1112-roomId: context.roomId,
1113-startIndex: startObservedIndex,
1114-sutUserId: context.sutUserId,
1115-}),
1116-);
1117-});
1082+.catch((err: unknown) => throwProgressTimeout(err, previewRootEventId));
11181083} else {
11191084progress = progressOrFinal;
11201085}
此内容由惯性聚合(RSS阅读器)自动聚合整理，仅供阅读参考。 原文来自 — 版权归原作者所有。