Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions packages/isomorphic/manualPromise.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,13 +114,15 @@ export class LongStandingScope {
}

export function signalToPromise(signal: AbortSignal): { promise: Promise<void>, dispose: () => void } {
if (signal.aborted)
return { promise: Promise.resolve(), dispose: () => {} };
let dispose: (() => void) | undefined;
const promise = new Promise<void>(resolve => {
if (signal.aborted)
resolve();
else
signal.addEventListener('abort', () => resolve(), { once: true });
const onAbort = () => resolve();
signal.addEventListener('abort', onAbort, { once: true });
dispose = () => signal.removeEventListener('abort', onAbort);
});
return { promise, dispose: () => {} };
return { promise, dispose: dispose! };
}

function cloneError(error: Error, frames: string[]) {
Expand Down
7 changes: 5 additions & 2 deletions packages/playwright/src/mcp/test/testContext.ts
Original file line number Diff line number Diff line change
Expand Up @@ -233,8 +233,9 @@ export class TestContext {
}
};

const abortPromise = signal
? signalToPromise(signal).promise.then(() => 'interrupted' as const)
const abort = signal ? signalToPromise(signal) : undefined;
const abortPromise = abort
? abort.promise.then(() => 'interrupted' as const)
: new Promise<never>(() => {});

try {
Expand Down Expand Up @@ -263,6 +264,8 @@ export class TestContext {
testRunnerAndScreen.output.push(String(e));
await cleanup();
return { output: testRunnerAndScreen.output.join('\n'), status };
} finally {
abort?.dispose();
}

await cleanup();
Expand Down
Loading