From 047d82990f6b6bdec866cf0099512c4bfff697cf Mon Sep 17 00:00:00 2001 From: Xidorn Quan Date: Mon, 4 Jul 2016 13:16:08 +1000 Subject: [PATCH] Bug 1283579 - Use data schema rather than outside document for test of bug 682592 to make it faster. r=jfkthame MozReview-Commit-ID: 6ccLpZF1qr8 --HG-- extra : rebase_source : e275f555152e38bf24ca833e5a876ade5776ed1c --- dom/base/test/bug682592-subframe-ref.html | 11 ----------- dom/base/test/bug682592-subframe.html | 10 ---------- dom/base/test/mochitest.ini | 2 -- dom/base/test/test_bug682592.html | 9 ++++++--- 4 files changed, 6 insertions(+), 26 deletions(-) delete mode 100644 dom/base/test/bug682592-subframe-ref.html delete mode 100644 dom/base/test/bug682592-subframe.html diff --git a/dom/base/test/bug682592-subframe-ref.html b/dom/base/test/bug682592-subframe-ref.html deleted file mode 100644 index 905804419a9e..000000000000 --- a/dom/base/test/bug682592-subframe-ref.html +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - -

- - - diff --git a/dom/base/test/bug682592-subframe.html b/dom/base/test/bug682592-subframe.html deleted file mode 100644 index 3bae94fcaee0..000000000000 --- a/dom/base/test/bug682592-subframe.html +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - -

- - diff --git a/dom/base/test/mochitest.ini b/dom/base/test/mochitest.ini index 623484e20e93..3eaa3aecf4f1 100644 --- a/dom/base/test/mochitest.ini +++ b/dom/base/test/mochitest.ini @@ -46,8 +46,6 @@ support-files = bug578096LoadChromeScript.js bug638112-response.txt bug638112.sjs - bug682592-subframe-ref.html - bug682592-subframe.html bug696301-script-1.js bug696301-script-1.js^headers^ bug696301-script-2.js diff --git a/dom/base/test/test_bug682592.html b/dom/base/test/test_bug682592.html index 9cba09abd997..c2dc8ed3a484 100644 --- a/dom/base/test/test_bug682592.html +++ b/dom/base/test/test_bug682592.html @@ -13,7 +13,7 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=682592

- + 
@@ -39,11 +39,13 @@ https://bugzilla.mozilla.org/show_bug.cgi?id=682592
 */
 
 SimpleTest.waitForExplicitFinish();
-SimpleTest.requestLongerTimeout(2);
+SimpleTest.requestLongerTimeout(3);
 if (navigator.platform.startsWith("Linux arm")) { /* bugs 982875, 999429 */
   SimpleTest.expectAssertions(0, 4);
 }
 
+var page = `data:text/html;charset=UTF-8,
+
`;
 var refFrame = document.getElementById("iframe-ref")
 var testFrame = document.getElementById("iframe-test");
 
@@ -60,8 +62,9 @@ refFrame.addEventListener("load", function() {
       SimpleTest.finish();
     }
   }, false);
-  testFrame.src = "bug682592-subframe.html"
+  testFrame.src = page;
 }, false);
+refFrame.src = page;
 
 var rtl = "עִבְרִית";
 var non8bit =  "ʃ";