Back out 9e126e97e347 (bug 1098700), a=backout
authorPhil Ringnalda <philringnalda@gmail.com>
Sun, 28 Dec 2014 22:57:38 -0800
changeset 247256 8850aa0f5332d3727c063669819e02dac4c5c959
parent 247255 6d5a1e68f248f3e3cb54234096bd1f535dda25bd
child 247277 0ca2f419c34f20561cde7a7e537974def6b63d05
child 247279 e17eccb249d144d28f82abd9729cd467af04d082
child 247288 a73ce3cb8b260ac335134e0aef91aa75f7e70ebf
push id4489
push userraliiev@mozilla.com
push dateMon, 23 Feb 2015 15:17:55 +0000
treeherdermozilla-beta@fd7c3dc24146 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbackout
bugs1098700
milestone37.0a1
backs out9e126e97e3470194832c2c799307e331aeaafe8c
first release with
nightly linux32
8850aa0f5332 / 37.0a1 / 20141229030217 / files
nightly linux64
8850aa0f5332 / 37.0a1 / 20141229030217 / files
nightly mac
8850aa0f5332 / 37.0a1 / 20141229030217 / files
nightly win32
8850aa0f5332 / 37.0a1 / 20141229030217 / files
nightly win64
8850aa0f5332 / 37.0a1 / 20141229030217 / files
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
releases
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Back out 9e126e97e347 (bug 1098700), a=backout
testing/mochitest/tests/SimpleTest/SimpleTest.js
--- 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);
 };