Merge m-c to m-i
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 28 Dec 2014 22:59:15 -0800
changeset 221451 0ca2f419c34f20561cde7a7e537974def6b63d05
parent 221449 00567505185332c26f197fbe5cb74528def0d229 (current diff)
parent 221450 8850aa0f5332d3727c063669819e02dac4c5c959 (diff)
child 221452 eb15e3f893453d6a4472f8905271aba33f8b68d5
child 221461 199930d6b2f7f3804d34552efc6a9083807c7332
push id53347
push userphilringnalda@gmail.com
push dateMon, 29 Dec 2014 06:59:28 +0000
treeherdermozilla-inbound@0ca2f419c34f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone37.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
Merge m-c to m-i
--- a/testing/mochitest/tests/SimpleTest/SimpleTest.js
+++ b/testing/mochitest/tests/SimpleTest/SimpleTest.js
@@ -254,17 +254,17 @@ SimpleTest.setExpected();
 SimpleTest.ok = function (condition, name, diag) {
 
     var test = {'result': !!condition, 'name': name, 'diag': diag};
     if (SimpleTest.expected == 'fail') {
       if (!test.result) {
         SimpleTest.num_failed++;
         test.result = !test.result;
       }
-      var successInfo = {status:"PASS", expected:"FAIL", message:"TEST-UNEXPECTED-PASS"};
+      var successInfo = {status:"PASS", expected:"PASS", message:"TEST-PASS"};
       var failureInfo = {status:"FAIL", expected:"FAIL", message:"TEST-KNOWN-FAIL"};
     } else {
       var successInfo = {status:"PASS", expected:"PASS", message:"TEST-PASS"};
       var failureInfo = {status:"FAIL", expected:"PASS", message:"TEST-UNEXPECTED-FAIL"};
     }
     SimpleTest._logResult(test, successInfo, failureInfo);
     SimpleTest._tests.push(test);
 };