http/tests/cookies/simple-cookies-expired.html sometimes fails on Lion Intel Release...
authorap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Aug 2013 23:03:48 +0000 (23:03 +0000)
committerap@apple.com <ap@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Wed, 21 Aug 2013 23:03:48 +0000 (23:03 +0000)
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:

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@154425 268f45cc-cd09-0410-ab3c-d52691b4dbfc

LayoutTests/ChangeLog
LayoutTests/http/tests/cookies/resources/clearCookies.cgi
LayoutTests/http/tests/cookies/resources/cookies-test-pre.js
LayoutTests/http/tests/cookies/simple-cookies-max-age.html
LayoutTests/http/tests/websocket/tests/hybi/httponly-cookie.pl
LayoutTests/platform/mac-wk2/TestExpectations
LayoutTests/platform/mac/TestExpectations

index 93cf1c2..fb75b97 100644 (file)
@@ -1,3 +1,27 @@
+2013-08-21  Alexey Proskuryakov  <ap@apple.com>
+
+        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  <bfulgham@apple.com>
 
         [Windows] Reenable some tests that pass now.
index 27896b7..20f4764 100755 (executable)
@@ -8,11 +8,11 @@ print 'Cache-Control: no-cache="set-cookie"' . "\n";
 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) {
index 0bcb456..636416a 100644 (file)
@@ -50,6 +50,10 @@ function testCookies(result)
 
 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 @@ function clearAllCookies()
 
         // 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";
     }
 }
 
index 535982d..b4ce079 100644 (file)
@@ -19,7 +19,7 @@ cookiesShouldBe("test=foobar; Max-Age=90000000", "test=foobar");
 clearCookies();
 
 debug("Check setting a cookie that timed out.");
-cookiesShouldBe("test2=foobar; Max-Age=0", "");
+cookiesShouldBe("test2=foobar; Max-Age=-1", "");
 clearCookies();
 
 successfullyParsed = true;
index 56d636c..d92faef 100755 (executable)
@@ -3,8 +3,8 @@ use strict;
 
 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;
index 8a3e1f2..134f116 100644 (file)
@@ -365,12 +365,10 @@ fast/forms/range/slider-delete-while-dragging-thumb.html
 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
index 9758008..3ec74fd 100644 (file)
@@ -851,9 +851,6 @@ media/video-size-intrinsic-scale.html
 # -- 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/112532 fast/frames/flattening/frameset-flattening-subframesets.html
 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/104954 http/tests/canvas/canvas-slow-font-loading.html [ ImageOnlyF
 
 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/12_Statement/12.6_Iteration_St
 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 ]