Bug 1236414 - Re-enable browser_crashedTabs.js with longer timeout. r=me
authorMike Conley <mconley@mozilla.com>
Thu, 11 Feb 2016 15:29:53 -0500
changeset 330839 5de4c2e4ddd4f04e4694f7a3b20a2432e4e5fa6c
parent 330838 0696fef38f0f221e0d8b319286c88f05d15942bf
child 330840 617e089684ae22f75215467ac13729d1ef3bf01e
child 331380 50151230368767ce1c63169cdcc3504457e84dfa
push id10857
push userbmo:hiikezoe@mozilla-japan.org
push dateSun, 14 Feb 2016 11:01:26 +0000
reviewersme
bugs1236414
milestone47.0a1
Bug 1236414 - Re-enable browser_crashedTabs.js with longer timeout. r=me MozReview-Commit-ID: FlXemvsEMCM
browser/components/sessionstore/test/browser.ini
browser/components/sessionstore/test/browser_crashedTabs.js
--- a/browser/components/sessionstore/test/browser.ini
+++ b/browser/components/sessionstore/test/browser.ini
@@ -72,17 +72,17 @@ run-if = e10s && crashreporter
 run-if = e10s
 [browser_attributes.js]
 [browser_backup_recovery.js]
 [browser_broadcast.js]
 [browser_capabilities.js]
 [browser_cleaner.js]
 [browser_cookies.js]
 [browser_crashedTabs.js]
-skip-if = true # bug 1236414
+skip-if = !e10s || !crashreporter
 [browser_unrestored_crashedTabs.js]
 skip-if = !e10s || !crashreporter
 [browser_revive_crashed_bg_tabs.js]
 skip-if = !e10s || !crashreporter
 [browser_dying_cache.js]
 [browser_dynamic_frames.js]
 [browser_form_restore_events.js]
 [browser_formdata.js]
--- a/browser/components/sessionstore/test/browser_crashedTabs.js
+++ b/browser/components/sessionstore/test/browser_crashedTabs.js
@@ -1,30 +1,27 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 "use strict";
 
-requestLongerTimeout(2);
+requestLongerTimeout(10);
 
 const PAGE_1 = "data:text/html,<html><body>A%20regular,%20everyday,%20normal%20page.";
 const PAGE_2 = "data:text/html,<html><body>Another%20regular,%20everyday,%20normal%20page.";
 
 // Turn off tab animations for testing
 Services.prefs.setBoolPref("browser.tabs.animate", false);
 registerCleanupFunction(() => {
   Services.prefs.clearUserPref("browser.tabs.animate");
 });
 
 // Allow tabs to restore on demand so we can test pending states
 Services.prefs.clearUserPref("browser.sessionstore.restore_on_demand");
 
-// Running this test in ASAN is slow.
-requestLongerTimeout(2);
-
 function clickButton(browser, id) {
   info("Clicking " + id);
 
   let frame_script = (id) => {
     let button = content.document.getElementById(id);
     button.click();
   };