Bug 1191670 - Tweak comments in some memory reporter tests. r=erahm.
authorNicholas Nethercote <nnethercote@mozilla.com>
Thu, 06 Aug 2015 19:07:50 -0700
changeset 288392 4367154a39b1afb2a0e9f573b26ee49cb5cad138
parent 288391 ca5ebc4c7af9d67938e94ba4c97614635c95ece4
child 288393 feb18f1bdeaac7c8e3122824c307b3314747d1ee
push id5067
push userraliiev@mozilla.com
push dateMon, 21 Sep 2015 14:04:52 +0000
treeherdermozilla-beta@14221ffe5b2f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerserahm
bugs1191670
milestone42.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 1191670 - Tweak comments in some memory reporter tests. r=erahm. DONTBUILD because comment-only changes.
toolkit/components/aboutmemory/tests/test_memoryReporters.xul
toolkit/components/aboutmemory/tests/test_memoryReporters2.xul
toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul
--- a/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
+++ b/toolkit/components/aboutmemory/tests/test_memoryReporters.xul
@@ -19,20 +19,16 @@
   <!-- some URIs that should be anonymized in anonymous mode -->
   <iframe id="amFrame"  height="200" src="http://example.org:80"></iframe>
   <iframe id="amFrame"  height="200" src="https://example.com:443"></iframe>
 
   <!-- test code goes here -->
   <script type="application/javascript">
   <![CDATA[
 
-  // Nb: this test is all JS and so should be done with an xpcshell test,
-  // but bug 671753 is preventing the memory-reporter-manager from being
-  // accessed from xpcshell.
-
   "use strict";
 
   const Cc = Components.classes;
   const Ci = Components.interfaces;
   const Cr = Components.results;
 
   const NONHEAP = Ci.nsIMemoryReporter.KIND_NONHEAP;
   const HEAP    = Ci.nsIMemoryReporter.KIND_HEAP;
--- a/toolkit/components/aboutmemory/tests/test_memoryReporters2.xul
+++ b/toolkit/components/aboutmemory/tests/test_memoryReporters2.xul
@@ -2,16 +2,19 @@
 <?xml-stylesheet href="chrome://global/skin" type="text/css"?>
 <?xml-stylesheet href="chrome://mochikit/content/tests/SimpleTest/test.css"
                  type="text/css"?>
 <window title="Memory reporters with child processes"
   xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
   <script type="application/javascript"
           src="chrome://mochikit/content/tests/SimpleTest/SimpleTest.js"/>
 
+  <!-- This file tests (in a rough fashion) whether the memory reporters are
+       producing sensible results in the presence of child processes. -->
+
   <!-- test results are displayed in the html:body -->
   <body xmlns="http://www.w3.org/1999/xhtml">
   </body>
 
   <!-- test code goes here -->
   <script type="application/javascript"><![CDATA[
 
   const Cc = Components.classes;
--- a/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul
+++ b/toolkit/components/aboutmemory/tests/test_sqliteMultiReporter.xul
@@ -11,19 +11,19 @@
 
   <!-- test code goes here -->
   <script type="application/javascript">
   <![CDATA[
 
   // Test for bug 708248, where the SQLite memory multi-reporter was
   // crashing when a DB was closed.
 
-  // Nb: this test is all JS and so should be done with an xpcshell test,
-  // but bug 671753 is preventing the memory-reporter-manager from being
-  // accessed from xpcshell.
+  // Nb: this test is all JS and chould be done with an xpcshell test,
+  // but all the other memory reporter tests are mochitests, so it's easier
+  // if this one is too.
 
   const Cc = Components.classes;
   const Ci = Components.interfaces;
   const Cu = Components.utils;
 
   // Make a fake DB file.
   let file = Cc["@mozilla.org/file/directory_service;1"].
              getService(Ci.nsIProperties).