Skip to content
Merged
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
10 changes: 8 additions & 2 deletions packages/playwright-core/src/tools/mcp/program.ts
Original file line number Diff line number Diff line change
Expand Up @@ -132,12 +132,18 @@ export function decorateMCPCommand(command: Command) {
},
disposed: async backend => {
clientCount--;
if (sharedBrowserPromise && clientCount > 0)
const browserContext = (backend as BrowserBackend).browserContext;

if (sharedBrowserPromise && clientCount > 0) {
if (config.browser.isolated) {
testDebug('close context');
await browserContext.close().catch(() => { });
}
return;
}

testDebug('close browser');
sharedBrowserPromise = undefined;
const browserContext = (backend as BrowserBackend).browserContext;
await browserContext.close().catch(() => { });
await browserContext.browser()?.close().catch(() => { });
}
Expand Down
4 changes: 3 additions & 1 deletion tests/mcp/http.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ test('http transport browser sigint', async ({ serverEndpoint, server }) => {
});
});

test('http transport browser lifecycle (isolated, multiclient)', async ({ serverEndpoint, server }) => {
test('http transport browser lifecycle (isolated, multiclient)', { annotation: { type: 'issue', description: 'https://github.com/microsoft/playwright/issues/41539' } }, async ({ serverEndpoint, server }) => {
const { url, stderr } = await serverEndpoint({ args: ['--isolated'] });

const transport1 = new StreamableHTTPClientTransport(new URL('/mcp', url));
Expand Down Expand Up @@ -200,6 +200,7 @@ test('http transport browser lifecycle (isolated, multiclient)', async ({ server
'delete http session': 3,
'create context': 3,
'create browser (isolated)': 1,
'close context': 2,
'close browser': 1,
});
});
Expand Down Expand Up @@ -229,6 +230,7 @@ test('http transport browser lifecycle (isolated, concurrent clients)', { annota
'delete http session': 3,
'create context': 3,
'create browser (isolated)': 1,
'close context': 2,
'close browser': 1,
});
});
Expand Down
1 change: 1 addition & 0 deletions tests/mcp/sse.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -161,6 +161,7 @@ test('sse transport browser lifecycle (isolated, multiclient)', async ({ serverE
'delete SSE session': 3,
'create context': 3,
'create browser (isolated)': 1,
'close context': 2,
'close browser': 1,
});
});
Expand Down
Loading