From 479671e610189243f94bdf961de59b8bf0e219a2 Mon Sep 17 00:00:00 2001
From: Ben Kelly <ben@wanderview.com>
Date: Fri, 27 May 2016 08:24:14 -0700
Subject: [PATCH] Bug 1275715 P1 Lengthen timeout for all tests using
 fetch_test_framework.js. r=asuth

---
 dom/tests/mochitest/fetch/fetch_test_framework.js | 7 +++++++
 dom/tests/mochitest/fetch/test_fetch_cors.html    | 4 ----
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/dom/tests/mochitest/fetch/fetch_test_framework.js b/dom/tests/mochitest/fetch/fetch_test_framework.js
index 01dc95e0b84a..d12ca20296af 100644
--- a/dom/tests/mochitest/fetch/fetch_test_framework.js
+++ b/dom/tests/mochitest/fetch/fetch_test_framework.js
@@ -1,4 +1,11 @@
 function testScript(script) {
+
+  // The framework runs the entire test in many different configurations.
+  // On slow platforms and builds this can make the tests likely to
+  // timeout while they are still running.  Lengthen the timeout to
+  // accomodate this.
+  SimpleTest.requestLongerTimeout(2);
+
   // reroute.html should have set this variable if a service worker is present!
   if (!("isSWPresent" in window)) {
     window.isSWPresent = false;
diff --git a/dom/tests/mochitest/fetch/test_fetch_cors.html b/dom/tests/mochitest/fetch/test_fetch_cors.html
index b01789c989ad..b9a6992a58bc 100644
--- a/dom/tests/mochitest/fetch/test_fetch_cors.html
+++ b/dom/tests/mochitest/fetch/test_fetch_cors.html
@@ -16,10 +16,6 @@
 <script type="text/javascript" src="utils.js"> </script>
 <script type="text/javascript" src="fetch_test_framework.js"> </script>
 <script class="testbody" type="text/javascript">
-
-// XXXcatalinb: this test takes a really long time to run on android debug.
-SimpleTest.requestLongerTimeout(2);
-
 testScript("test_fetch_cors.js");
 </script>
 </body>