Backed out changeset 38bfa2af2bd8 (bug 1023547) for making test_promise.html perma-fail.
authorRyan VanderMeulen <ryanvm@gmail.com>
Sun, 20 Jul 2014 15:39:04 -0400
changeset 195170 131e77486177c869068704e77fde5c139ce2b4a2
parent 195169 4ca15c5bab96212bc22a4e4e3c189e2b5fe63094
child 195171 b00c22ac9b230810123a0d99bc1f3447465a8b7b
push id46522
push userryanvm@gmail.com
push dateSun, 20 Jul 2014 19:39:07 +0000
treeherdermozilla-inbound@131e77486177 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1023547
milestone33.0a1
backs out38bfa2af2bd8ba1af78fa917d67dd2488b9f7edb
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
Backed out changeset 38bfa2af2bd8 (bug 1023547) for making test_promise.html perma-fail.
dom/promise/tests/test_promise.html
dom/workers/test/promise_worker.js
--- a/dom/promise/tests/test_promise.html
+++ b/dom/promise/tests/test_promise.html
@@ -631,24 +631,21 @@ function promiseResolveThenableCleanStac
   var results = [];
 
   Promise.resolve(thenable).then(incX);
   results.push(x);
 
   // check what happens after all "next cycle" steps
   // have had a chance to complete
   setTimeout(function(){
+    results.push(x);
     // Result should be [0, 2] since `thenable` will be called async.
     is(results[0], 0, "Expected thenable to be called asynchronously");
-    // See Bug 1023547 comment 13 for why this check has to be gated on p.
-    p.then(function() {
-      results.push(x);
-      is(results[1], 2, "Expected thenable to be called asynchronously");
-      runTest();
-    });
+    is(results[1], 2, "Expected thenable to be called asynchronously");
+    runTest();
   },1000);
 }
 
 // Bug 1008467 - Promise fails with "too much recursion".
 // The bug was that the callbacks passed to a thenable would resolve the
 // promise synchronously when the fulfill handler returned a non-thenable.
 //
 // For example:
--- a/dom/workers/test/promise_worker.js
+++ b/dom/workers/test/promise_worker.js
@@ -667,21 +667,21 @@ function promiseResolveThenableCleanStac
   var results = [];
 
   var p = Promise.resolve(thenable).then(incX);
   results.push(x);
 
   // check what happens after all "next cycle" steps
   // have had a chance to complete
   setTimeout(function(){
+    results.push(x);
     // Result should be [0, 2] since `thenable` will be called async.
     is(results[0], 0, "Expected thenable to be called asynchronously");
     // See Bug 1023547 comment 13 for why this check has to be gated on p.
     p.then(function() {
-      results.push(x);
       is(results[1], 2, "Expected thenable to be called asynchronously");
       runTest();
     });
   },1000);
 }
 
 var tests = [
     promiseResolve,