Updated tests for CSP.
--- a/tests/csp/submitted/WG/CSP_1_4_1.php Fri May 17 09:37:21 2013 -0700
+++ b/tests/csp/submitted/WG/CSP_1_4_1.php Wed May 22 17:18:02 2013 -0700
@@ -6,7 +6,7 @@
* combine it to form the full CSP header.
*****/
$policy_string = "script-src 'self' 'unsafe-inline'";
-$title = "eval equivalents should not execute with policy \"$policy_string\".";
+$title = "setInterval, setTimeout with non-callable args should not execute with policy \"$policy_string\".";
/*****
* The support script setReportAsCookie.php will echo the contents of the CSP report
@@ -41,8 +41,6 @@
<script src="/resources/testharnessreport.js"></script>
</head>
- <h1> TODO: Function constructor, etc. </h1>
-
<body onLoad="test(function() {assert_false(true, 'Unsafe inline onLoad() event handler ran.')});">
<h1><?php echo $title ?></h1>
<div id=log></div>
--- a/tests/csp/submitted/WG/MANIFEST Fri May 17 09:37:21 2013 -0700
+++ b/tests/csp/submitted/WG/MANIFEST Wed May 22 17:18:02 2013 -0700
@@ -6,5 +6,10 @@
CSP_1_3.php
CSP_1_4.php
CSP_1_4_1.php
+CSP_1_4_2.php
CSP_1_5.php
+CSP_1_6.php
+CSP_1_10.php
+CSP_1_10_1.php
+manual CSP_1_7.php
support support/clearCookies.html
--- a/tests/testRunner/runner.js Fri May 17 09:37:21 2013 -0700
+++ b/tests/testRunner/runner.js Wed May 22 17:18:02 2013 -0700
@@ -315,6 +315,8 @@
case "manual":
if (!this.mSkipManual) {
this.showManualUI()
+ this.currentTest().timeout =
+ setTimeout(function() { runner.timedOut() }, this.sTimeout);
this.mIframe.src = this.mPath + this.currentTest().url;
} else {
this.finishTest();