Bug 1287714 - Skip browser_CaptivePortalWatcher.js on OS X debug e10s for constant timeouts. a=test-only
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 07 Aug 2016 15:34:55 -0700
changeset 349760 598f3192bee83c1fa944788cd224f2439e4f506d
parent 349759 60fbe83386618e0c9cd6a5984c35c83a31686f8a
child 349761 521e05ecc100b0397652d112555fa1e489b201f2
push id1230
push userjlund@mozilla.com
push dateMon, 31 Oct 2016 18:13:35 +0000
treeherdermozilla-release@5e06e3766db2 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerstest-only
bugs1287714
milestone50.0a2
Bug 1287714 - Skip browser_CaptivePortalWatcher.js on OS X debug e10s for constant timeouts. a=test-only
browser/modules/test/browser.ini
--- a/browser/modules/test/browser.ini
+++ b/browser/modules/test/browser.ini
@@ -2,17 +2,17 @@
 support-files =
   head.js
 
 [browser_BrowserUITelemetry_buckets.js]
 [browser_BrowserUITelemetry_defaults.js]
 [browser_BrowserUITelemetry_sidebar.js]
 [browser_BrowserUITelemetry_syncedtabs.js]
 [browser_CaptivePortalWatcher.js]
-skip-if = os == "linux" || os == "win" # Bug 1279491
+skip-if = os == "linux" || os == "win" || (os == "mac" && debug && e10s) # Bug 1279491, Bug 1287714 for OS X debug e10s
 [browser_ProcessHangNotifications.js]
 skip-if = !e10s
 [browser_ContentSearch.js]
 support-files =
   contentSearch.js
   contentSearchBadImage.xml
   contentSearchSuggestions.sjs
   contentSearchSuggestions.xml