Bug 404077: Adjust annotations of expected assertions. CLOSED TREE
authorL. David Baron <dbaron@dbaron.org>
Wed, 27 Feb 2013 18:12:17 -0800
changeset 134527 414a59f13ea4a7dc5cdbc917f9f40f841af7334c
parent 134526 2186eacb635c4149acdc857647a7ce546c978666
child 134528 d859fffb9648ffe3d418c58db74e62a929723998
push id336
push userakeybl@mozilla.com
push dateMon, 17 Jun 2013 22:53:19 +0000
treeherdermozilla-release@574a39cdf657 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs404077
milestone22.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 404077: Adjust annotations of expected assertions. CLOSED TREE
content/media/test/test_seek_out_of_range.html
docshell/test/test_bug413310.html
dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html
toolkit/content/tests/chrome/test_bug554279.xul
toolkit/content/tests/chrome/test_bug570192.xul
toolkit/content/tests/chrome/test_menuchecks.xul
--- a/content/media/test/test_seek_out_of_range.html
+++ b/content/media/test/test_seek_out_of_range.html
@@ -6,17 +6,17 @@
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
   <script type="text/javascript" src="manifest.js"></script>
 </head>
 <body>
 <pre id="test">
 <script class="testbody" type="text/javascript">
 
 if (navigator.platform.startsWith("Win")) {
-  SimpleTest.expectAssertions(0, 1);
+  SimpleTest.expectAssertions(0, 8);
 }
 
 var manager = new MediaTestManager;
 
 // Test if the ended event works correctly.
 
 function startTest(e) {
   var v = e.target;
--- a/docshell/test/test_bug413310.html
+++ b/docshell/test/test_bug413310.html
@@ -8,16 +8,20 @@ https://bugzilla.mozilla.org/show_bug.cg
   <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
   <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
 </head>
 <body>
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=413310">Mozilla Bug 413310</a>
 <p id="display">
 <script class="testbody" type="text/javascript">
 
+if (navigator.platform.startsWith("Win")) {
+  SimpleTest.expectAssertions(0, 1);
+}
+
 /** Test for Bug 413310 **/
 
 // NOTE: If we ever make subframes do bfcache stuff, this test will need to be
 // modified accordingly!  It assumes that subframes do NOT get bfcached.
 var onloadCount = 0;
 
 var step = -1;  // One increment will come from the initial subframe onload.
                 // Note that this script should come before the subframe,
--- a/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html
+++ b/dom/media/tests/mochitest/test_peerConnection_basicAudioVideoCombined.html
@@ -19,17 +19,17 @@ https://bugzilla.mozilla.org/show_bug.cg
 
   <video id="videoPCLocal" width="160" height="120" controls></video>
   <video id="videoPCRemote" width="160" height="120" controls></video>
   <video id="videoLocal" width="160" height="120" controls></video>
 </div>
 <pre id="test">
 <script type="application/javascript">
 
-  SimpleTest.expectAssertions(0, 1);
+  SimpleTest.expectAssertions(0, 6);
 
   var audioLocal;
   var videoLocal;
   var videoPCLocal;
   var videoPCRemote;
 
   var pcLocal;
   var pcRemote;
--- a/toolkit/content/tests/chrome/test_bug554279.xul
+++ b/toolkit/content/tests/chrome/test_bug554279.xul
@@ -16,16 +16,18 @@
   <!-- test resuls are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml"
         style="height: 300px; overflow: auto;"/>
   
   <!-- test code goes here -->
   <script type="text/javascript"><![CDATA[
     if (navigator.platform.startsWith("Mac")) {
       SimpleTest.expectAssertions(0, 5);
+    } else if (navigator.platform.startsWith("Linux")) {
+      SimpleTest.expectAssertions(0, 3);
     }
 
     var toolbar = $("tb1");
 
     ok(toolbar, "got the toolbar, triggering the xbl constructor");
 
     var palette = $("palette");
     ok(palette, "palette is still in the document");
--- a/toolkit/content/tests/chrome/test_bug570192.xul
+++ b/toolkit/content/tests/chrome/test_bug570192.xul
@@ -31,17 +31,17 @@ https://bugzilla.mozilla.org/show_bug.cg
     <pre id="test">
     </pre>
   </body>
 
   <script type="application/javascript">
     <![CDATA[
 
     if (navigator.platform.startsWith("Mac")) {
-      SimpleTest.expectAssertions(0, 2);
+      SimpleTest.expectAssertions(0, 3);
     } else if (navigator.platform.startsWith("Linux")) {
       SimpleTest.expectAssertions(0, 5);
     } else if (navigator.platform.startsWith("Win")) {
       SimpleTest.expectAssertions(0, 1);
     }
 
     addLoadEvent(function() {
       try {
--- a/toolkit/content/tests/chrome/test_menuchecks.xul
+++ b/toolkit/content/tests/chrome/test_menuchecks.xul
@@ -31,18 +31,18 @@
   </hbox>
 
   <!--
   This test checks that checkbox and radio menu items work properly
   -->
   <script class="testbody" type="application/javascript">
   <![CDATA[
 
-  if (navigator.platform.startsWith("Mac")) {
-    SimpleTest.expectAssertions(0, 2);
+  if (!navigator.platform.startsWith("Linux")) {
+    SimpleTest.expectAssertions(0, 3);
   }
 
   SimpleTest.waitForExplicitFinish();
   var gTestIndex = 0;
 
   // tests to perform
   var tests = [
     {