Bug 1067022 - Annotate the expected 5 "bad inline size" assertions on 10.10 in test_bug995943.xul, r=dbaron
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 18 Jan 2015 12:53:13 -0800
changeset 224458 c5e5421fd495113297e81e6daf2ea576f4aa7749
parent 224457 ac5cc826d9d4aac9b4e47d322c3971eeec8eeccc
child 224459 d77230596cb5c3e096f438858b2e4f62f43f6f37
push id28131
push usercbook@mozilla.com
push dateMon, 19 Jan 2015 15:10:25 +0000
treeherdermozilla-central@f8e4fdb89a05 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersdbaron
bugs1067022, 995943
milestone38.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 1067022 - Annotate the expected 5 "bad inline size" assertions on 10.10 in test_bug995943.xul, r=dbaron
caps/tests/mochitest/test_bug995943.xul
--- a/caps/tests/mochitest/test_bug995943.xul
+++ b/caps/tests/mochitest/test_bug995943.xul
@@ -21,18 +21,20 @@ https://bugzilla.mozilla.org/show_bug.cg
   const Cc = Components.classes;
   const Ci = Components.interfaces;
   Cu.import("resource://gre/modules/Services.jsm");
   function debug(msg) { info(msg); }
 
   /** Test for CAPS file:// URI prefs. **/
   SimpleTest.waitForExplicitFinish();
   SimpleTest.requestCompleteLog();
-  if (Services.appinfo.OS == "Darwin") // See bug 1067022
-    SimpleTest.expectAssertions(0, 1);
+  if (navigator.userAgent.indexOf("Mac OS X 10.10") != -1)
+    SimpleTest.expectAssertions(5); // See bug 1067022
+  else if (Services.appinfo.OS == "Darwin")
+    SimpleTest.expectAssertions(0, 1); // See bug 1067022
 
   var rootdir = Services.appinfo.OS == "WINNT" ? "file:///C:" : "file:///";
 
   function checkLoadFileURI(domain, shouldLoad) {
     debug("Invoking checkLoadFileURI with domain: " + domain + ", shouldLoad: " + shouldLoad);
     return new Promise(function(resolve, reject) {
       $('ifr').addEventListener('load', function l1() {
         debug("Invoked l1 for " + domain);