Commit 43cb6910 authored by Gavin Sharp's avatar Gavin Sharp
Browse files

Bug 723207: fix SimpleTest.info when called as just info(), r=jmaher 

--HG--
extra : transplant_source : %02%AC%FC%98%E8%23%FE%9A%3D%BC%DEck%16%9FP%CE%95%B3%AF
parent 355b10c4

docshell/test/chrome/test_principalInherit.xul

+1 −1
Original line number Diff line number Diff line
@@ -97,7 +97,7 @@ function nextTest() { 
  if (tests.length) {

    let test = tests.shift();

    SimpleTest.executeSoon(function () {

      SimpleTest.info("running " + test.name);

      info("running " + test.name);

      test(nextTest);

    });

  } else

testing/mochitest/chrome/test_sanityChromeUtils.xul

+2 −2
Original line number Diff line number Diff line
@@ -51,7 +51,7 @@ 
  </script>

  <script type="application/javascript">

  <![CDATA[

    SimpleTest.info("\nProfile::ChromeUtilsLoadTime: " + (loadTime - start) + "\n");

    info("\nProfile::ChromeUtilsLoadTime: " + (loadTime - start) + "\n");

    var testFile = Components.classes["@mozilla.org/file/directory_service;1"].

                      getService(Components.interfaces.nsIProperties).

                      get("CurWorkD", Components.interfaces.nsIFile);
@@ -196,7 +196,7 @@ 
      is(content, true, "synthesizeSelectionSet should succeed");



      var endTime = new Date();

      SimpleTest.info("\nProfile::ChromeUtilsRunTime: " + (endTime-startTime) + "\n");

      info("\nProfile::ChromeUtilsRunTime: " + (endTime-startTime) + "\n");

      SimpleTest.finish();

    };

  ]]>

testing/mochitest/chrome/test_sanityPluginUtils.html

+2 −2
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 
<!-- load the test plugin defined at $(DIST)/bin/plugins/Test.plugin/ -->

<embed id="plugin1" type="application/x-test" width="200" height="200"></embed>

<script class="testbody" type="text/javascript">

SimpleTest.info("\nProfile::PluginUtilsLoadTime: " + (loadTime - start) + "\n");

info("\nProfile::PluginUtilsLoadTime: " + (loadTime - start) + "\n");

function starttest() {

  SimpleTest.waitForExplicitFinish();

  var startTime = new Date();
@@ -30,7 +30,7 @@ function starttest() { 
    --runtimes;

  }

  var endTime = new Date();

  SimpleTest.info("\nProfile::PluginUtilsRunTime: " + (endTime-startTime) + "\n");

  info("\nProfile::PluginUtilsRunTime: " + (endTime-startTime) + "\n");

  SimpleTest.finish();

};

</script>

testing/mochitest/tests/SimpleTest/SimpleTest.js

+1 −1
Original line number Diff line number Diff line
@@ -284,7 +284,7 @@ SimpleTest._logResult = function(test, passString, failString) { 
};



SimpleTest.info = function(name, message) {

    this._logResult({result:true, name:name, diag:message}, "TEST-INFO");

    SimpleTest._logResult({result:true, name:name, diag:message}, "TEST-INFO");

};



/**

testing/mochitest/tests/test_SpecialPowersExtension.html

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ function starttest(){ 
  noxray.b = 122;

  is(noxray_wrapper.b, 122, "Should be able to shadow.");



  SimpleTest.info("\nProfile::SpecialPowersRunTime: " + (new Date() - startTime) + "\n");

  info("\nProfile::SpecialPowersRunTime: " + (new Date() - startTime) + "\n");

  SimpleTest.finish();

}

</script>