Title: [106906] trunk/LayoutTests
- Revision
- 106906
- Author
- aba...@webkit.org
- Date
- 2012-02-06 22:33:38 -0800 (Mon, 06 Feb 2012)
Log Message
http/tests/security/xssAuditor/cookie-injection.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=77908
Reviewed by Eric Seidel.
Before this patch, the output of this test depended on the state of the
global cookie store. When running tests in parallel, the cookie store
is shared by multiple tests, and so its state varies from run to run.
This patch changes this test to look only for the specific cookie used
by this test, which should make the test more reliable when run in
parallel with other tests.
* http/tests/security/xssAuditor/cookie-injection-expected.txt:
* http/tests/security/xssAuditor/resources/echo-intertag.pl:
* platform/chromium/test_expectations.txt:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (106905 => 106906)
--- trunk/LayoutTests/ChangeLog 2012-02-07 05:45:01 UTC (rev 106905)
+++ trunk/LayoutTests/ChangeLog 2012-02-07 06:33:38 UTC (rev 106906)
@@ -1,3 +1,22 @@
+2012-02-06 Adam Barth <aba...@webkit.org>
+
+ http/tests/security/xssAuditor/cookie-injection.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=77908
+
+ Reviewed by Eric Seidel.
+
+ Before this patch, the output of this test depended on the state of the
+ global cookie store. When running tests in parallel, the cookie store
+ is shared by multiple tests, and so its state varies from run to run.
+
+ This patch changes this test to look only for the specific cookie used
+ by this test, which should make the test more reliable when run in
+ parallel with other tests.
+
+ * http/tests/security/xssAuditor/cookie-injection-expected.txt:
+ * http/tests/security/xssAuditor/resources/echo-intertag.pl:
+ * platform/chromium/test_expectations.txt:
+
2012-02-06 Hayato Ito <hay...@chromium.org>
Implement querySelector on ShadowRoot.
Modified: trunk/LayoutTests/http/tests/security/xssAuditor/cookie-injection-expected.txt (106905 => 106906)
--- trunk/LayoutTests/http/tests/security/xssAuditor/cookie-injection-expected.txt 2012-02-07 05:45:01 UTC (rev 106905)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/cookie-injection-expected.txt 2012-02-07 06:33:38 UTC (rev 106906)
@@ -1,4 +1,4 @@
CONSOLE MESSAGE: Refused to execute a _javascript_ script. Source code of script found within request.
-ALERT: cookie:
+ALERT: PASS
Modified: trunk/LayoutTests/http/tests/security/xssAuditor/cookie-injection.html (106905 => 106906)
--- trunk/LayoutTests/http/tests/security/xssAuditor/cookie-injection.html 2012-02-07 05:45:01 UTC (rev 106905)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/cookie-injection.html 2012-02-07 06:33:38 UTC (rev 106906)
@@ -9,7 +9,7 @@
</script>
</head>
<body>
-<iframe src=""
+<iframe src=""
</iframe>
</body>
</html>
Modified: trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl (106905 => 106906)
--- trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl 2012-02-07 05:45:01 UTC (rev 106905)
+++ trunk/LayoutTests/http/tests/security/xssAuditor/resources/echo-intertag.pl 2012-02-07 06:33:38 UTC (rev 106906)
@@ -48,7 +48,7 @@
print "<p>If you see this message then the test FAILED.</p>\n";
}
if ($cgi->param('alert-cookie')) {
- print "<script>alert('cookie: ' + document.cookie); document.cookie = 'testcookie=remove; max-age=-1';</script>\n";
+ print "<script>if (/xssAuditorTestCookie/.test(document.cookie)) { alert('FAIL: ' + document.cookie); document.cookie = 'xssAuditorTestCookie=remove; max-age=-1'; } else alert('PASS');</script>\n";
}
print "</body>\n";
print "</html>\n";
Modified: trunk/LayoutTests/platform/chromium/test_expectations.txt (106905 => 106906)
--- trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-07 05:45:01 UTC (rev 106905)
+++ trunk/LayoutTests/platform/chromium/test_expectations.txt 2012-02-07 06:33:38 UTC (rev 106906)
@@ -769,15 +769,14 @@
// Note: this test was also marked as flaky on WIN RELEASE above, BUGCR31342.
BUGCR39423 : security/block-test.html = TIMEOUT
-// Flaky: fails about 5% of the time.
-BUGCR31342 WIN RELEASE : security/block-test-no-port.html = PASS TEXT
-
BUGCR20345 : http/tests/security/cross-frame-access-getOwnPropertyDescriptor.html = TEXT
-BUGCR42044 WIN : http/tests/security/xss-DENIED-mime-type-execute-as-html.html = PASS TIMEOUT
BUGWK42769 : http/tests/security/401-logout/401-logout.php = TIMEOUT
+
+BUGCR42044 WIN : http/tests/security/xss-DENIED-mime-type-execute-as-html.html = PASS TIMEOUT
BUGDPRANKE WIN : http/tests/security/credentials-in-referer.html = PASS TIMEOUT
-BUGWK70298 : http/tests/security/xssAuditor/cookie-injection.html = TEXT PASS
BUGCR24182 WIN RELEASE : http/tests/security/cross-origin-css.html = PASS TIMEOUT
+// Flaky: fails about 5% of the time.
+BUGCR31342 WIN RELEASE : security/block-test-no-port.html = PASS TEXT
// -----------------------------------------------------------------
// Plugin tests
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
