Bug 482073 - test_classifier.html issues leading to intermittent failures. r=waldo

This commit is contained in:
Dave Camp 2009-03-10 14:57:59 -07:00
parent dfe3277503
commit d4612bdc64
5 changed files with 8 additions and 12 deletions

View File

@ -155,4 +155,4 @@ https://sub.sectest1.example.org:443
#
# Used while testing the url-classifier
#
http://malware.com:80
http://malware.example.com:80

View File

@ -20,10 +20,10 @@ function checkLoads() {
</script>
<!-- Try loading from a malware javascript URI -->
<script type="text/javascript" src="http://malware.com/tests/toolkit/components/url-classifier/tests/mochitest/evil.js"></script>
<script type="text/javascript" src="http://malware.example.com/tests/toolkit/components/url-classifier/tests/mochitest/evil.js"></script>
<!-- Try loading from a malware css URI
<link rel="stylesheet" type="text/css" href="http://malware.com/tests/toolkit/components/url-classifier/tests/mochitest/evil.css"></link>
<!-- Try loading from a malware css URI -->
<link rel="stylesheet" type="text/css" href="http://malware.example.com/tests/toolkit/components/url-classifier/tests/mochitest/evil.css"></link>
<!-- Try loading a marked-as-malware css through an @import from a clean URI -->
<link rel="stylesheet" type="text/css" href="import.css"></link>

View File

@ -1 +1 @@
@import url("http://malware.com/tests/docshell/test/classifierBad.css");
@import url("http://malware.example.com/tests/docshell/test/classifierBad.css");

View File

@ -6,7 +6,7 @@
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<body onload="doUpdate(testUpdate);">
<p id="display"></p>
<div id="content" style="display: none">
</div>
@ -19,7 +19,7 @@ var Cc = Components.classes;
var Ci = Components.interfaces;
// Add some URLs to the malware database.
var testData = "malware.com/";
var testData = "malware.example.com/";
var testUpdate =
"n:1000\ni:test-malware-simple\nad:1\n" +
"a:524:32:" + testData.length + "\n" +
@ -70,8 +70,6 @@ function doUpdate(update) {
}
}
doUpdate(testUpdate);
SimpleTest.waitForExplicitFinish();
</script>

View File

@ -6,7 +6,7 @@
<script type="text/javascript" src="/tests/SimpleTest/SimpleTest.js"></script>
<link rel="stylesheet" type="text/css" href="/tests/SimpleTest/test.css" />
</head>
<body>
<body onload="doUpdate(testUpdate);">
<p id="display"></p>
<div id="content" style="display: none">
</div>
@ -83,8 +83,6 @@ function onmessage(event)
window.addEventListener("message", onmessage, false);
doUpdate(testUpdate);
SimpleTest.waitForExplicitFinish();
</script>