Fixes 5558 - Move requestLongerTimeout to global space (#5656)

Author: darkwing

src/test/mochitest/browser_dbg-babel-stepping.js

@@ -2,6 +2,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests for stepping through Babel's compile output.
+requestLongerTimeout(4);
 
 async function breakpointSteps(dbg, fixture, { line, column }, steps) {
   const { selectors: { getBreakpoint, getBreakpoints }, getState } = dbg;
@@ -161,8 +162,6 @@ function testStepOverRegeneratorAwait(dbg) {
 }
 
 add_task(async function() {
-  requestLongerTimeout(4);
-
   const dbg = await initDebugger("doc-babel.html");
 
   await testStepOverForOf(dbg);

src/test/mochitest/browser_dbg-breakpoints-reloading.js

@@ -2,6 +2,7 @@
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 // Tests pending breakpoints when reloading
+requestLongerTimeout(3);
 
 // Utilities for interacting with the editor
 function clickGutter(dbg, line) {
@@ -24,8 +25,6 @@ function assertEditorBreakpoint(dbg, line) {
 }
 
 add_task(async function() {
-  requestLongerTimeout(3);
-
   const dbg = await initDebugger("doc-scripts.html");
   const { selectors: { getBreakpoints, getBreakpoint }, getState } = dbg;
   const source = findSource(dbg, "simple1.js");

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

@@ -6,6 +6,7 @@
 /**
  * Tests that a chrome debugger can be created in a new process.
  */
+requestLongerTimeout(5);
 
 const { BrowserToolboxProcess } = ChromeUtils.import(
   "resource://devtools/client/framework/ToolboxProcess.jsm",
@@ -43,7 +44,6 @@ registerCleanupFunction(function() {
 
 add_task(async function() {
   // Windows XP and 8.1 test slaves are terribly slow at this test.
-  requestLongerTimeout(5);
   await pushPref("devtools.chrome.enabled", true);
   await pushPref("devtools.debugger.remote-enabled", true);
 

src/test/mochitest/browser_dbg-editor-select.js

@@ -3,13 +3,12 @@
 
 // Tests that the editor highlights the correct location when the
 // debugger pauses
+requestLongerTimeout(2);
 
 add_task(async function() {
   // This test runs too slowly on linux debug. I'd like to figure out
   // which is the slowest part of this and make it run faster, but to
   // fix a frequent failure allow a longer timeout.
-  requestLongerTimeout(2);
-
   const dbg = await initDebugger("doc-scripts.html");
   const { selectors: { getSelectedSource }, getState } = dbg;
   const simple1 = findSource(dbg, "simple1.js");

src/test/mochitest/browser_dbg-layout-changes.js

@@ -5,13 +5,12 @@
  * This if the debugger's layout is correctly modified when the toolbox's
  * host changes.
  */
+requestLongerTimeout(2);
 
 var gDefaultHostType = Services.prefs.getCharPref("devtools.toolbox.host");
 
 add_task(async function() {
   // test is too slow on some platforms due to the number of test cases
-  requestLongerTimeout(2);
-
   const dbg = await initDebugger("doc-iframes.html");
 
   const layouts = [

src/test/mochitest/browser_dbg-sourcemaps-bogus.js

@@ -3,11 +3,10 @@
 
 // Test that an error while loading a sourcemap does not break
 // debugging.
+requestLongerTimeout(2);
 
 add_task(async function() {
   // NOTE: the CORS call makes the test run times inconsistent
-  requestLongerTimeout(2);
-
   const dbg = await initDebugger("doc-sourcemap-bogus.html");
   const { selectors: { getSources }, getState } = dbg;
 

src/test/mochitest/browser_dbg-sourcemaps-reloading.js

@@ -1,5 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
+requestLongerTimeout(2);
 
 async function waitForBreakpointCount(dbg, count) {
   return waitForState(
@@ -10,8 +11,6 @@ async function waitForBreakpointCount(dbg, count) {
 
 add_task(async function() {
   // NOTE: the CORS call makes the test run times inconsistent
-  requestLongerTimeout(2);
-
   const dbg = await initDebugger("doc-sourcemaps.html");
   const { selectors: { getBreakpoint, getBreakpoints }, getState } = dbg;
 

src/test/mochitest/browser_dbg-sourcemaps.js

@@ -3,6 +3,7 @@
 
 // Tests loading sourcemapped sources, setting breakpoints, and
 // stepping in them.
+requestLongerTimeout(2);
 
 function assertBreakpointExists(dbg, source, line) {
   const { selectors: { getBreakpoint }, getState } = dbg;
@@ -35,8 +36,6 @@ function clickGutter(dbg, line) {
 
 add_task(async function() {
   // NOTE: the CORS call makes the test run times inconsistent
-  requestLongerTimeout(2);
-
   const dbg = await initDebugger("doc-sourcemaps.html");
   const { selectors: { getBreakpoint, getBreakpoints }, getState } = dbg;
 

src/test/mochitest/browser_dbg-sourcemaps2.js

@@ -1,5 +1,6 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
+requestLongerTimeout(2);
 
 function assertBpInGutter(dbg, lineNumber) {
   const el = findElement(dbg, "breakpoint");
@@ -17,8 +18,6 @@ function assertBpInGutter(dbg, lineNumber) {
 // This source map does not have source contents, so it's fetched separately
 add_task(async function() {
   // NOTE: the CORS call makes the test run times inconsistent
-  requestLongerTimeout(2);
-
   const dbg = await initDebugger("doc-sourcemaps2.html");
   const { selectors: { getBreakpoint, getBreakpoints }, getState } = dbg;
 

src/test/mochitest/browser_dbg-sourcemaps3.js

@@ -3,11 +3,11 @@
 
 // Tests loading sourcemapped sources, setting breakpoints, and
 // inspecting restored scopes.
+requestLongerTimeout(2);
 
 // This source map does not have source contents, so it's fetched separately
 add_task(async function() {
   // NOTE: the CORS call makes the test run times inconsistent
-  requestLongerTimeout(2);
   await pushPref("devtools.debugger.features.map-scopes", true);
 
   const dbg = await initDebugger("doc-sourcemaps3.html");