Title: [204384] trunk/Tools
Revision
204384
Author
achristen...@apple.com
Date
2016-08-11 13:21:25 -0700 (Thu, 11 Aug 2016)

Log Message

Fix Yosemite bots' cookie accept policies after r204365.
https://bugs.webkit.org/show_bug.cgi?id=160758

* TestWebKitAPI/Tests/WebKit2Cocoa/CookieAcceptPolicy.mm:
(TEST):
This makes the test fully clean up after itself.

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (204383 => 204384)


--- trunk/Tools/ChangeLog	2016-08-11 20:20:05 UTC (rev 204383)
+++ trunk/Tools/ChangeLog	2016-08-11 20:21:25 UTC (rev 204384)
@@ -5,6 +5,15 @@
 
         * TestWebKitAPI/Tests/WebKit2Cocoa/CookieAcceptPolicy.mm:
         (TEST):
+        This makes the test fully clean up after itself.
+
+2016-08-11  Alex Christensen  <achristen...@webkit.org>
+
+        Fix Yosemite bots' cookie accept policies after r204365.
+        https://bugs.webkit.org/show_bug.cgi?id=160758
+
+        * TestWebKitAPI/Tests/WebKit2Cocoa/CookieAcceptPolicy.mm:
+        (TEST):
         I didn't restore the cookieAcceptPolicy of the sharedHTTPCookieStorage after changing it with this API test.
         On Yosemite, this is changing the cookieAcceptPolicy that DumpRenderTree uses.
         On more recent Cocoa platforms, it is only changing the cookieAcceptPolicy that TestWebKitAPI uses, which isn't

Modified: trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CookieAcceptPolicy.mm (204383 => 204384)


--- trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CookieAcceptPolicy.mm	2016-08-11 20:20:05 UTC (rev 204383)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKit2Cocoa/CookieAcceptPolicy.mm	2016-08-11 20:21:25 UTC (rev 204384)
@@ -71,9 +71,7 @@
     TestWebKitAPI::Util::run(&receivedScriptMessage);
     EXPECT_STREQ([(NSString *)[lastScriptMessage body] UTF8String], "COOKIE:");
     
-    // FIXME: Set back to originalCookieAcceptPolicy.
-    UNUSED_PARAM(originalCookieAcceptPolicy);
-    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:NSHTTPCookieAcceptPolicyOnlyFromMainDocumentDomain];
+    [[NSHTTPCookieStorage sharedHTTPCookieStorage] setCookieAcceptPolicy:originalCookieAcceptPolicy];
     [[NSHTTPCookieStorage sharedHTTPCookieStorage] _saveCookies];
 }
 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to