Filip/playwright
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

browser(firefox): await browser initialization when closing browser (#4121)

Browse source 
We try to avoid closing firefox too early, fearing that this
might terminate clean shutdown sequence.

Usually we assume that `Browser.enable` is called before `Browser.close`
- however, this is not the case in certain tests. So we have to
ensure browser initialization in `Browser.close` as well.

In my local tests, this fixes the Firefox Pipe problem: it looks like
we were closing browser too quickly.
This commit is contained in:
Andrey Lushnikov 2020-10-12 22:34:04 -07:00 committed by GitHub
parent 8ad340479d
commit 58285f6155
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
browser_patches/firefox/BUILD_NUMBER
View file

@ -1,2 +1,2 @@
1188 1189
Changed: lushnikov@chromium.org Wed Oct 7 14:29:11 PDT 2020 Changed: lushnikov@chromium.org Mon Oct 12 22:21:30 PDT 2020

8
browser_patches/firefox/juggler/protocol/BrowserHandler.js
View file

@ -51,7 +51,7 @@ class BrowserHandler {
// service before returning from this method. Failing to do so will result // service before returning from this method. Failing to do so will result
// in a broken shutdown sequence and multiple errors in browser STDERR log. // in a broken shutdown sequence and multiple errors in browser STDERR log.
// //
// NOTE: we have to put this here instead of in the `Browser.close` handler // NOTE: we have to put this here as well as in the `Browser.close` handler
// since browser shutdown can be initiated when the last tab is closed, e.g. // since browser shutdown can be initiated when the last tab is closed, e.g.
// with persistent context. // with persistent context.
await Promise.all([ await Promise.all([
@ -139,6 +139,12 @@ class BrowserHandler {
if (browserWindow && browserWindow.gBrowserInit) { if (browserWindow && browserWindow.gBrowserInit) {
await browserWindow.gBrowserInit.idleTasksFinishedPromise; await browserWindow.gBrowserInit.idleTasksFinishedPromise;
} }
// Try to fully initialize browser before closing.
// See comment in `Browser.enable`.
await Promise.all([
waitForAddonManager(),
waitForSearchService(),
]);
this._onclose(); this._onclose();
Services.startup.quit(Ci.nsIAppStartup.eForceQuit); Services.startup.quit(Ci.nsIAppStartup.eForceQuit);
} }