- Revision
- 154425
- Author
- [email protected]
- Date
- 2013-08-21 16:03:48 -0700 (Wed, 21 Aug 2013)
Log Message
http/tests/cookies/simple-cookies-expired.html sometimes fails on Lion Intel Release (Tests)
https://bugs.webkit.org/show_bug.cgi?id=73694
http/tests/cookies/simple-cookies-max-age.html sometimes fails on Lion Intel Release (Tests)
https://bugs.webkit.org/show_bug.cgi?id=73695
http/tests/cookies/single-quoted-value.html intermittently fails on Mac
https://bugs.webkit.org/show_bug.cgi?id=105603
Reviewed by Dan Bernstein.
Woark around a CFNetwork issue by using Max-Age=-1 instead of Max-Age=0. Since it's
WebKit that we are testing and not the lower level networking, this does not change
test coverage.
* http/tests/cookies/resources/clearCookies.cgi:
* http/tests/cookies/resources/cookies-test-pre.js:
* http/tests/cookies/simple-cookies-max-age.html:
* http/tests/websocket/tests/hybi/httponly-cookie.pl:
* platform/mac-wk2/TestExpectations:
* platform/mac/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (154424 => 154425)
--- trunk/LayoutTests/ChangeLog 2013-08-21 22:45:22 UTC (rev 154424)
+++ trunk/LayoutTests/ChangeLog 2013-08-21 23:03:48 UTC (rev 154425)
@@ -1,3 +1,27 @@
+2013-08-21 Alexey Proskuryakov <[email protected]>
+
+ http/tests/cookies/simple-cookies-expired.html sometimes fails on Lion Intel Release (Tests)
+ https://bugs.webkit.org/show_bug.cgi?id=73694
+
+ http/tests/cookies/simple-cookies-max-age.html sometimes fails on Lion Intel Release (Tests)
+ https://bugs.webkit.org/show_bug.cgi?id=73695
+
+ http/tests/cookies/single-quoted-value.html intermittently fails on Mac
+ https://bugs.webkit.org/show_bug.cgi?id=105603
+
+ Reviewed by Dan Bernstein.
+
+ Woark around a CFNetwork issue by using Max-Age=-1 instead of Max-Age=0. Since it's
+ WebKit that we are testing and not the lower level networking, this does not change
+ test coverage.
+
+ * http/tests/cookies/resources/clearCookies.cgi:
+ * http/tests/cookies/resources/cookies-test-pre.js:
+ * http/tests/cookies/simple-cookies-max-age.html:
+ * http/tests/websocket/tests/hybi/httponly-cookie.pl:
+ * platform/mac-wk2/TestExpectations:
+ * platform/mac/TestExpectations:
+
2013-08-21 Brent Fulgham <[email protected]>
[Windows] Reenable some tests that pass now.
Modified: trunk/LayoutTests/http/tests/cookies/resources/clearCookies.cgi (154424 => 154425)
--- trunk/LayoutTests/http/tests/cookies/resources/clearCookies.cgi 2013-08-21 22:45:22 UTC (rev 154424)
+++ trunk/LayoutTests/http/tests/cookies/resources/clearCookies.cgi 2013-08-21 23:03:48 UTC (rev 154425)
@@ -8,11 +8,11 @@
my $cookie = $ENV{"HTTP_CLEAR_COOKIE"};
if ($cookie =~ /Max-Age/i) {
- $cookie =~ s/Max-Age *= *[0-9]+/Max-Age=0/i;
+ $cookie =~ s/Max-Age *= *[0-9]+/Max-Age=-1/i;
} else {
$cookie .= ";" unless ($cookie =~ m/;$/);
$cookie .= " " unless ($cookie =~ m/ $/);
- $cookie .= "Max-Age=0";
+ $cookie .= "Max-Age=-1";
}
if ($cookie =~ /Expires/i) {
Modified: trunk/LayoutTests/http/tests/cookies/resources/cookies-test-pre.js (154424 => 154425)
--- trunk/LayoutTests/http/tests/cookies/resources/cookies-test-pre.js 2013-08-21 22:45:22 UTC (rev 154424)
+++ trunk/LayoutTests/http/tests/cookies/resources/cookies-test-pre.js 2013-08-21 23:03:48 UTC (rev 154425)
@@ -50,6 +50,10 @@
function clearAllCookies()
{
+ // FIXME: This function is very wrong. If there is a cookie with a path (or any other
+ // parameter) it will just spin forever. It is not possible to delete all cookies from
+ // _javascript_, we should add a TestRunner API and switch to it.
+
var cookieString;
while (cookieString = document.cookie) {
var cookieName = cookieString.substr(0, cookieString.indexOf("=") || cookieString.length());
@@ -58,7 +62,7 @@
// In case clearCookies.cgi failed, for example,
// the domain/path do not match exactly:
- document.cookie = cookieName + "=;Max-Age=0";
+ document.cookie = cookieName + "=;Max-Age=-1";
}
}
Modified: trunk/LayoutTests/http/tests/cookies/simple-cookies-max-age.html (154424 => 154425)
--- trunk/LayoutTests/http/tests/cookies/simple-cookies-max-age.html 2013-08-21 22:45:22 UTC (rev 154424)
+++ trunk/LayoutTests/http/tests/cookies/simple-cookies-max-age.html 2013-08-21 23:03:48 UTC (rev 154425)
@@ -19,7 +19,7 @@
clearCookies();
debug("Check setting a cookie that timed out.");
-cookiesShouldBe("test2=foobar; Max-Age=0", "");
+cookiesShouldBe("test2=foobar; Max-Age=-1", "");
clearCookies();
successfullyParsed = true;
Modified: trunk/LayoutTests/http/tests/websocket/tests/hybi/httponly-cookie.pl (154424 => 154425)
--- trunk/LayoutTests/http/tests/websocket/tests/hybi/httponly-cookie.pl 2013-08-21 22:45:22 UTC (rev 154424)
+++ trunk/LayoutTests/http/tests/websocket/tests/hybi/httponly-cookie.pl 2013-08-21 23:03:48 UTC (rev 154425)
@@ -3,8 +3,8 @@
if ($ENV{"QUERY_STRING"} eq "clear=1") {
print "Content-Type: text/plain\r\n";
- print "Set-Cookie: WK-websocket-test=0; Max-Age=0\r\n";
- print "Set-Cookie: WK-websocket-test-httponly=0; HttpOnly; Max-Age=0\r\n";
+ print "Set-Cookie: WK-websocket-test=0; Max-Age=-1\r\n";
+ print "Set-Cookie: WK-websocket-test-httponly=0; HttpOnly; Max-Age=-1\r\n";
print "\r\n";
print "Cookies are cleared.";
exit;
Modified: trunk/LayoutTests/platform/mac/TestExpectations (154424 => 154425)
--- trunk/LayoutTests/platform/mac/TestExpectations 2013-08-21 22:45:22 UTC (rev 154424)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2013-08-21 23:03:48 UTC (rev 154425)
@@ -851,9 +851,6 @@
# -- Flaky tests (WebKit 1 only) ---
platform/mac/accessibility/search-with-frames.html
-# -- Flaky tests (WebKit 2 only) ---
-http/tests/websocket/tests/hybi/httponly-cookie.pl
-
# --- Media ---
media/controls-styling.html
media/media-document-audio-repaint.html
@@ -959,10 +956,6 @@
webkit.org/b/106185 fast/frames/flattening/iframe-flattening-fixed-height.html [ Failure Pass ]
webkit.org/b/106185 fast/frames/flattening/frameset-flattening-grid.html [ Failure Pass ]
-# Flakey cookies tests
-webkit.org/b/73694 http/tests/cookies/simple-cookies-expired.html [ Failure Pass ]
-webkit.org/b/73695 http/tests/cookies/simple-cookies-max-age.html [ Failure Pass ]
-
webkit.org/b/69999 [ Release ] http/tests/security/contentSecurityPolicy/media-src-allowed.html [ Failure Pass ]
webkit.org/b/73766 css3/unicode-bidi-isolate-aharon-failing.html [ ImageOnlyFailure ]
@@ -1129,8 +1122,6 @@
webkit.org/b/104962 platform/mac/fast/loader/file-url-mimetypes-2.html [ Failure ]
-webkit.org/b/105603 http/tests/cookies/single-quoted-value.html [ Failure Pass ]
-
webkit.org/b/105777 platform/mac/editing/spelling/autocorrection-in-textarea.html [ Failure Pass ]
webkit.org/b/105999 [ Lion ] fast/canvas/canvas-composite-canvas.html [ Failure ]
@@ -1182,9 +1173,6 @@
webkit.org/b/111647 [ Debug ] sputnik/Conformance/13_Function_Definition/S13_A4_T4.html [ Slow ]
webkit.org/b/111647 [ Debug ] sputnik/Unicode/Unicode_218/S7.6_A5.3_T2.html [ Slow ]
-webkit.org/b/111650 http/tests/cookies/third-party-cookie-relaxing.html [ Failure Pass ]
-webkit.org/b/111650 http/tests/plugins/third-party-cookie-accept-policy.html [ Failure Pass ]
-
webkit.org/b/111754 inspector/debugger/debugger-expand-scope.html [ Crash Pass ]
webkit.org/b/111606 fast/borders/border-fit-2.html [ Failure Pass ]
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (154424 => 154425)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2013-08-21 22:45:22 UTC (rev 154424)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2013-08-21 23:03:48 UTC (rev 154425)
@@ -365,12 +365,10 @@
http/tests/security/credentials-in-referer.html
svg/W3C-SVG-1.1/fonts-elem-04-b.svg
-# All additional tests that failed on the Lion WebKit2 Debug bot in r111739
-http/tests/cookies/simple-cookies-expired.html
+# An additional test that failed on the Lion WebKit2 Debug bot in r111739
inspector/elements/edit-dom-actions.html
-# All tests that failed more than once on the Lion WebKit2 Debug bot between r111808 and r111849
-http/tests/cookies/simple-cookies-max-age.html
+# A test that failed more than once on the Lion WebKit2 Debug bot between r111808 and r111849
fast/workers/worker-cloneport.html
# Intermittent crashes
