Bug 1209521 - Re-enable browser_cookies_exceptions.js on Linux. r=Gijs
authorJared Wein <jwein@mozilla.com>
Tue, 29 Sep 2015 17:35:00 +0200
changeset 265675 32dc4f8f3aa0def426ec4745a402981050a8a6c8
parent 265674 6e82a342d591890dbec410240fd4133a007a8038
child 265676 9629c91c939b07c6c0a5f8c878a079407729a084
push id66003
push usercbook@mozilla.com
push dateFri, 02 Oct 2015 11:37:40 +0000
treeherdermozilla-inbound@3fd732d24f46 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersGijs
bugs1209521
milestone44.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1209521 - Re-enable browser_cookies_exceptions.js on Linux. r=Gijs
browser/components/preferences/in-content/tests/browser.ini
browser/components/preferences/in-content/tests/browser_cookies_exceptions.js
--- a/browser/components/preferences/in-content/tests/browser.ini
+++ b/browser/components/preferences/in-content/tests/browser.ini
@@ -13,17 +13,16 @@ support-files =
 [browser_bug1018066_resetScrollPosition.js]
 [browser_bug1020245_openPreferences_to_paneContent.js]
 [browser_change_app_handler.js]
 skip-if = os != "win" # This test tests the windows-specific app selection dialog, so can't run on non-Windows
 [browser_chunk_permissions.js]
 [browser_connection.js]
 [browser_connection_bug388287.js]
 [browser_cookies_exceptions.js]
-skip-if = os == "linux" # See bug 1209521 for re-enabling on Linux
 [browser_healthreport.js]
 skip-if = !healthreport || (os == 'linux' && debug)
 [browser_permissions.js]
 [browser_proxy_backup.js]
 [browser_privacypane_1.js]
 [browser_privacypane_3.js]
 [browser_privacypane_4.js]
 [browser_privacypane_5.js]
--- a/browser/components/preferences/in-content/tests/browser_cookies_exceptions.js
+++ b/browser/components/preferences/in-content/tests/browser_cookies_exceptions.js
@@ -1,13 +1,14 @@
 /* Any copyright is dedicated to the Public Domain.
  * http://creativecommons.org/publicdomain/zero/1.0/ */
 
 function test() {
   waitForExplicitFinish();
+  requestLongerTimeout(2);
   testRunner.runTests();
 }
 
 var testRunner = {
 
   tests:
     [
       {