Title: [144466] releases/WebKitGTK/webkit-2.0/LayoutTests
Revision
144466
Author
[email protected]
Date
2013-03-01 09:48:07 -0800 (Fri, 01 Mar 2013)

Log Message

Merge r144045 - REGRESSION (r143931): set-cookie-on-redirect.html breaks subsequent tests
https://bugs.webkit.org/show_bug.cgi?id=110844

Patch by Sergio Villar Senin <[email protected]> on 2013-02-26
Reviewed by Alexey Proskuryakov.

Clean up cookies at the beginning and after finishing the test in
order not to break other tests behavior.

* http/tests/cookies/resources/set-cookie-on-redirect.php: clear cookie before returning.
* http/tests/cookies/set-cookie-on-redirect.html: clear all cookies before starting the test.

Modified Paths

Diff

Modified: releases/WebKitGTK/webkit-2.0/LayoutTests/ChangeLog (144465 => 144466)


--- releases/WebKitGTK/webkit-2.0/LayoutTests/ChangeLog	2013-03-01 17:43:31 UTC (rev 144465)
+++ releases/WebKitGTK/webkit-2.0/LayoutTests/ChangeLog	2013-03-01 17:48:07 UTC (rev 144466)
@@ -1,3 +1,16 @@
+2013-02-26  Sergio Villar Senin  <[email protected]>
+
+        REGRESSION (r143931): set-cookie-on-redirect.html breaks subsequent tests
+        https://bugs.webkit.org/show_bug.cgi?id=110844
+
+        Reviewed by Alexey Proskuryakov.
+
+        Clean up cookies at the beginning and after finishing the test in
+        order not to break other tests behavior.
+
+        * http/tests/cookies/resources/set-cookie-on-redirect.php: clear cookie before returning.
+        * http/tests/cookies/set-cookie-on-redirect.html: clear all cookies before starting the test.
+
 2013-02-25  Sergio Villar Senin  <[email protected]>
 
         [soup] "Too many redirects" error loading chat in plus.google.com

Modified: releases/WebKitGTK/webkit-2.0/LayoutTests/http/tests/cookies/resources/set-cookie-on-redirect.php (144465 => 144466)


--- releases/WebKitGTK/webkit-2.0/LayoutTests/http/tests/cookies/resources/set-cookie-on-redirect.php	2013-03-01 17:43:31 UTC (rev 144465)
+++ releases/WebKitGTK/webkit-2.0/LayoutTests/http/tests/cookies/resources/set-cookie-on-redirect.php	2013-03-01 17:48:07 UTC (rev 144466)
@@ -9,6 +9,9 @@
 } else if ($_GET['step'] == 3) {
   header("HTTP/1.0 200 OK");
   if (isset($_COOKIE['test_cookie'])) {
+    /* Clear cookie in order not to affect other tests. */
+    setcookie("test_cookie", "", time() - 1);
+
     echo "PASSED: Cookie successfully set\n";
   } else {
     echo "FAILED: Cookie not set\n";

Modified: releases/WebKitGTK/webkit-2.0/LayoutTests/http/tests/cookies/set-cookie-on-redirect.html (144465 => 144466)


--- releases/WebKitGTK/webkit-2.0/LayoutTests/http/tests/cookies/set-cookie-on-redirect.html	2013-03-01 17:43:31 UTC (rev 144465)
+++ releases/WebKitGTK/webkit-2.0/LayoutTests/http/tests/cookies/set-cookie-on-redirect.html	2013-03-01 17:48:07 UTC (rev 144466)
@@ -1,11 +1,12 @@
 <!DOCTYPE HTML PUBLIC "-//IETF//DTD HTML//EN">
 <html>
-
+<script src=""
 <script>
 if (window.testRunner) {
     testRunner.dumpAsText();
     testRunner.waitUntilDone();
 }
+clearAllCookies();
 
 function doRedirect()
 {
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to