Skip to content

Commit 06d217b

Browse files
jasonLasterdarkwing
authored andcommitted
Backport changes from MC (firefox-devtools#5696)
+ Backport Bug 1442312 - Stop using deprecated-sync-thenables in DebuggerServerConnection._queueResponse + Backport - Bug 1440321 - Convert Task.jsm to async/await in devtools/client. r=jryans + Add toolbox test + backport browser.ini
1 parent aff7bb0 commit 06d217b

4 files changed

Lines changed: 11 additions & 0 deletions

File tree

.travis.yml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,3 +58,4 @@ script:
5858
browser_webconsole_eval_in_debugger_stackframe2.js
5959
browser_webconsole_location_debugger_link.js
6060
browser_webconsole_stacktrace_location_debugger_link.js
61+
browser_browser_toolbox_debugger.js

src/test/mochitest/browser.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -188,6 +188,7 @@ skip-if = os == "win" # Bug 1434792
188188
[browser_dbg-sources.js]
189189
[browser_dbg-sources-named-eval.js]
190190
[browser_dbg-stepping.js]
191+
skip-if = debug
191192
[browser_dbg-tabs.js]
192193
[browser_dbg-tabs-pretty-print.js]
193194
[browser_dbg-toggling-tools.js]

src/test/mochitest/browser_dbg-chrome-create.js

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,13 @@
66
/**
77
* Tests that a chrome debugger can be created in a new process.
88
*/
9+
10+
// There are shutdown issues for which multiple rejections are left uncaught.
11+
// See bug 1018184 for resolving these issues.
12+
const { PromiseTestUtils } = scopedCuImport("resource://testing-common/PromiseTestUtils.jsm");
13+
PromiseTestUtils.whitelistRejectionsGlobally(/File closed/);
14+
PromiseTestUtils.whitelistRejectionsGlobally(/NS_ERROR_FAILURE/);
15+
916
requestLongerTimeout(5);
1017

1118
const { BrowserToolboxProcess } = ChromeUtils.import(

src/test/mochitest/head.js

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,8 @@ Services.scriptloader.loadSubScript(
3939
);
4040

4141
var { Toolbox } = require("devtools/client/framework/toolbox");
42+
var { Task } = require("devtools/shared/task");
43+
4244
const sourceUtils = {
4345
isLoaded: source => source.get("loadedState") === "loaded"
4446
};

0 commit comments

Comments
 (0)