Revert rev 9211bfa02ed5 (Bug 1315260). Wrong commit message. r=me
authorAndreas Farre <farre@mozilla.com>
Fri, 09 Dec 2016 04:46:31 +0100
changeset 325480 6ddb12dd47ab87007b9515b297d1dc136d34b2b6
parent 325479 9211bfa02ed5d2807fba8253cff6eb9383ce3f5d
child 325481 5d0d6750d202af446866baeb57aa0830d5b3d52c
push id24
push usermaklebus@msu.edu
push dateTue, 20 Dec 2016 03:11:33 +0000
reviewersme
bugs1315260
milestone53.0a1
Revert rev 9211bfa02ed5 (Bug 1315260). Wrong commit message. r=me MozReview-Commit-ID: 7uFDhNpx4XP
testing/web-platform/meta/XMLHttpRequest/open-url-multi-window-6.htm.ini
testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-6.htm
deleted file mode 100644
--- a/testing/web-platform/meta/XMLHttpRequest/open-url-multi-window-6.htm.ini
+++ /dev/null
@@ -1,5 +0,0 @@
-[open-url-multi-window-6.htm]
-  type: testharness
-  [XMLHttpRequest: open() in document that is not fully active (but may be active) should throw]
-    expected: FAIL
-
--- a/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-6.htm
+++ b/testing/web-platform/tests/XMLHttpRequest/open-url-multi-window-6.htm
@@ -21,18 +21,18 @@
             var ifr = document.createElement("iframe");
             ifr.onload = function() {
               // Again, do things async so we're not doing loads from inside
               // load events.
               setTimeout(function() {
                 client = new ifr.contentWindow.XMLHttpRequest();
                 count++;
                 // Important to do a normal navigation, not a reload.
-                win.location.href = "resources/init.htm?avoid-replace";
-              }, 0);
+                win.location.href = "resources/init.htm";
+              }, 100);
             }
             doc.body.appendChild(ifr);
           } else if(1 == count) {
             assert_throws("InvalidStateError", function() { client.open("GET", "...") })
             test.done()
           }
         })
       }