From 325a9a014aa3223edbb5ad68c1ee2b0a81b93693 Mon Sep 17 00:00:00 2001 From: Ben Kelly Date: Fri, 11 Dec 2015 12:36:05 -0500 Subject: [PATCH] Bug 1213119 Lengthen timeout in test checking for failure to load iframes and windows. r=ehsan --- testing/web-platform/mozilla/meta/MANIFEST.json | 1 + .../service-worker/fetch-frame-resource.https.html | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/testing/web-platform/mozilla/meta/MANIFEST.json b/testing/web-platform/mozilla/meta/MANIFEST.json index 3b51dbc56909..f2c251462840 100644 --- a/testing/web-platform/mozilla/meta/MANIFEST.json +++ b/testing/web-platform/mozilla/meta/MANIFEST.json @@ -182,6 +182,7 @@ "service-workers/service-worker/fetch-frame-resource.https.html": [ { "path": "service-workers/service-worker/fetch-frame-resource.https.html", + "timeout": "long", "url": "/_mozilla/service-workers/service-worker/fetch-frame-resource.https.html" } ], diff --git a/testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-frame-resource.https.html b/testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-frame-resource.https.html index b468f8c358b2..cc1dac472bca 100644 --- a/testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-frame-resource.https.html +++ b/testing/web-platform/mozilla/tests/service-workers/service-worker/fetch-frame-resource.https.html @@ -1,5 +1,6 @@ Service Worker: Fetch for the frame loading. + @@ -45,7 +46,7 @@ function getLoadedObject(win, contentFunc, closeFunc) { // use default empty string for cross-domain window } done(content); - }, 5000); + }, 10000); win.onload = function() { clearTimeout(timeout);