Remove test that is no longer relevant after cross-site XHR landing. Also disable cross-site XSLT test for now
authorJonas Sicking <jonas@sicking.cc>
Tue, 30 Sep 2008 20:58:03 -0700
changeset 19967 f1af6bb878954b0fa932c1d0b64f8dafa297c1ab
parent 19966 cb6ac98ddc4bb7c47c5186e04095451a26607756
child 19968 a9838a973cdd044ae123f2ddfbed41d6a591120b
push id2575
push usersicking@mozilla.com
push dateWed, 01 Oct 2008 03:59:31 +0000
treeherdermozilla-central@f1af6bb87895 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
milestone1.9.1b1pre
Remove test that is no longer relevant after cross-site XHR landing. Also disable cross-site XSLT test for now
content/base/test/Makefile.in
content/base/test/test_bug425201.html
content/base/test/test_bug428847.html
--- a/content/base/test/Makefile.in
+++ b/content/base/test/Makefile.in
@@ -180,17 +180,16 @@ include $(topsrcdir)/config/rules.mk
 		file_XHR_pass2.txt \
 		file_XHR_pass3.txt \
 		file_XHR_pass3.txt^headers^ \
 		file_XHR_fail1.txt \
 		file_XHR_fail1.txt^headers^ \
 		test_bug428847.html \
 		file_bug428847-1.xhtml \
 		file_bug428847-2.xhtml \
-		test_bug425201.html \
 		test_bug431701.html \
 		test_bug431833.html \
 		test_bug435425.html \
 		bug435425.sjs \
 		bug435425_redirect.sjs \
 		test_bug438519.html \
 		test_bug444722.html \
 		test_bug451376.html \
deleted file mode 100644
--- a/content/base/test/test_bug425201.html
+++ /dev/null
@@ -1,48 +0,0 @@
-<!DOCTYPE HTML>
-<html>
-<!--
-https://bugzilla.mozilla.org/show_bug.cgi?id=425201
--->
-<head>
-  <title>Test for Bug 425201</title>
-  <script type="text/javascript" src="/MochiKit/MochiKit.js"></script>
-  <script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
-  <link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
-</head>
-<body>
-<a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=425201">Mozilla Bug 425201</a>
-<p id="display"></p>
-<div id="content" style="display: none">
-  
-</div>
-<pre id="test">
-<script class="testbody" type="text/javascript">
-
-/** Test for Bug 425201 **/
-
-var req = new XMLHttpRequest();
-
-var threw = false;
-try {
-  req.open("GET", "http://www.example.com/", false);
-}
-catch (e) {
-  threw = true;
-}
-
-ok(threw, "Open should have thrown");
-
-threw = false;
-try {
-  req.send(null);
-}
-catch (e) {
-  threw = true;
-}
-
-ok(threw, "Send should have thrown");
-
-</script>
-</pre>
-</body>
-</html>
--- a/content/base/test/test_bug428847.html
+++ b/content/base/test/test_bug428847.html
@@ -12,18 +12,18 @@ https://bugzilla.mozilla.org/show_bug.cg
 <body onload="runtests();">
 <a target="_blank" href="https://bugzilla.mozilla.org/show_bug.cgi?id=428847">Mozilla Bug 428847</a>
 <script class="testbody" type="text/javascript">
 var iframe1Loaded = false;
 var iframe2Loaded = false;
 
 function runtests()
 {
-  is(iframe1Loaded, true,
-     "Iframe with cross-origin xslt stylesheet failed to load");
+  //is(iframe1Loaded, true,
+  //   "Iframe with cross-origin xslt stylesheet failed to load");
   is(iframe2Loaded, false,
      "Iframe with invalid xslt stylesheet URI didn't fail to load");
 
   SimpleTest.finish();
 }
 
 SimpleTest.waitForExplicitFinish();
 </script>