http/tests/cookies/third-party-cookie-relaxing.html is flaky on bots

https://bugs.webkit.org/show_bug.cgi?id=138098

Reviewed by Anders Carlsson.

Source/WebCore:

* platform/network/cf/NetworkStorageSessionCFNet.cpp:
(WebCore::NetworkStorageSession::switchToNewTestingSession):
Create a separate session for each WKTR/DRT process when testing.

Source/WebKit2:

* NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
* WebProcess/com.apple.WebProcess.sb.in:
Update for the new name of testing session. Memory regions are now of the form
"WebKit Test-<pid>-0".

LayoutTests:

* platform/mac-wk1/TestExpectations: Removed the test from expectations. It's still
skipped on WK2, because we don't yet implement the necessary WKTR functionality.

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

diff --git a/LayoutTests/ChangeLog b/LayoutTests/ChangeLog
index 7be1ee4..e06c51e 100644 (file)
--- a/LayoutTests/ChangeLog
+++ b/LayoutTests/ChangeLog
@@ -1,5 +1,15 @@
 2014-10-27  Alexey Proskuryakov  <ap@apple.com>
 
+        http/tests/cookies/third-party-cookie-relaxing.html is flaky on bots
+        https://bugs.webkit.org/show_bug.cgi?id=138098
+
+        Reviewed by Anders Carlsson.
+
+        * platform/mac-wk1/TestExpectations: Removed the test from expectations. It's still
+        skipped on WK2, because we don't yet implement the necessary WKTR functionality.
+
+2014-10-27  Alexey Proskuryakov  <ap@apple.com>
+
         Add [ Yosemite ] modifier to a couple of tests in section 7.
 
         These two tests fail with PPT, so they are expected to pass on 10.8. Our current

diff --git a/LayoutTests/platform/mac-wk1/TestExpectations b/LayoutTests/platform/mac-wk1/TestExpectations
index 5d5bc11..8c83e91 100644 (file)
--- a/LayoutTests/platform/mac-wk1/TestExpectations
+++ b/LayoutTests/platform/mac-wk1/TestExpectations
@@ -19,10 +19,6 @@ webkit.org/b/124318 fullscreen/anonymous-block-merge-crash.html [ Pass Failure ]
 webkit.org/b/132421 fast/multicol/fixed-stack.html [ ImageOnlyFailure ]
 [ MountainLion Mavericks ] fast/multicol/fixed-stack.html [ Pass ]
 
-# Failing itermittently on Yosemite Release WK1 bots. 
-webkit.org/b/138098 http/tests/cookies/third-party-cookie-relaxing.html [ Pass Failure ]
-[ MountainLion Mavericks ] http/tests/cookies/third-party-cookie-relaxing.html [ Pass ]
-
 ### END OF (1) Failures with bug reports
 ########################################
 

diff --git a/Source/WebCore/ChangeLog b/Source/WebCore/ChangeLog
index bd5f687..64de649 100644 (file)
--- a/Source/WebCore/ChangeLog
+++ b/Source/WebCore/ChangeLog
@@ -1,3 +1,14 @@
+2014-10-27  Alexey Proskuryakov  <ap@apple.com>
+
+        http/tests/cookies/third-party-cookie-relaxing.html is flaky on bots
+        https://bugs.webkit.org/show_bug.cgi?id=138098
+
+        Reviewed by Anders Carlsson.
+
+        * platform/network/cf/NetworkStorageSessionCFNet.cpp:
+        (WebCore::NetworkStorageSession::switchToNewTestingSession):
+        Create a separate session for each WKTR/DRT process when testing.
+
 2014-10-27  Chris Dumez  <cdumez@apple.com>
 
         Use separate HashMaps for common and uncommon headers in HTTPHeaderMap

diff --git a/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp b/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp
index 81dff2e..4ab59ff 100644 (file)
--- a/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp
+++ b/Source/WebCore/platform/network/cf/NetworkStorageSessionCFNet.cpp
@@ -53,12 +53,12 @@ static OwnPtr<NetworkStorageSession>& defaultNetworkStorageSession()
 
 void NetworkStorageSession::switchToNewTestingSession()
 {
-    // Set a private session for testing to avoid interfering with global cookies. This should be different from private browsing session.
-    // FIXME: It looks like creating a new session with the same identifier may be just creating a reference to the same storage. See <rdar://problem/11571450> and <rdar://problem/12384380>.
+    // Session name should be short enough for shared memory region name to be under the limit, otehrwise sandbox rules won't work (see <rdar://problem/13642852>).
+    String sessionName = String::format("WebKit Test-%u", static_cast<uint32_t>(getpid()));
 #if PLATFORM(COCOA)
-    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(CFSTR("Private WebKit Session")))));
+    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get()))));
 #else
-    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(CFSTR("Private WebKit Session"), defaultNetworkStorageSession()->platformSession()))));
+    defaultNetworkStorageSession() = adoptPtr(new NetworkStorageSession(adoptCF(wkCreatePrivateStorageSession(sessionName.createCFString().get(), defaultNetworkStorageSession()->platformSession()))));
 #endif
 }
 

diff --git a/Source/WebKit2/ChangeLog b/Source/WebKit2/ChangeLog
index 819f70c..2da6ce7 100644 (file)
--- a/Source/WebKit2/ChangeLog
+++ b/Source/WebKit2/ChangeLog
@@ -1,3 +1,15 @@
+2014-10-27  Alexey Proskuryakov  <ap@apple.com>
+
+        http/tests/cookies/third-party-cookie-relaxing.html is flaky on bots
+        https://bugs.webkit.org/show_bug.cgi?id=138098
+
+        Reviewed by Anders Carlsson.
+
+        * NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in:
+        * WebProcess/com.apple.WebProcess.sb.in:
+        Update for the new name of testing session. Memory regions are now of the form
+        "WebKit Test-<pid>-0".
+
 2014-10-27  Chris Dumez  <cdumez@apple.com>
 
         Use separate HashMaps for common and uncommon headers in HTTPHeaderMap

diff --git a/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in b/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
index 0bd23b2..cb46da3 100644 (file)
--- a/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
+++ b/Source/WebKit2/NetworkProcess/mac/com.apple.WebKit.NetworkProcess.sb.in
@@ -88,7 +88,7 @@
 (allow ipc-posix-shm-read-data
     (ipc-posix-name "FNetwork.defaultStorageSession")
     (ipc-posix-name-regex #"\.PrivateBrowsing-")
-    (ipc-posix-name-regex #"^Private WebKit Session-"))
+    (ipc-posix-name-regex #"^WebKit Test-"))
 
 ;; Various services required by CFNetwork and other frameworks
 (allow mach-lookup

diff --git a/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in b/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in
index 36f1d1c..55f8509 100644 (file)
--- a/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in
+++ b/Source/WebKit2/WebProcess/com.apple.WebProcess.sb.in
@@ -148,7 +148,7 @@
 (allow ipc-posix-shm-read-data
     (ipc-posix-name "FNetwork.defaultStorageSession")
     (ipc-posix-name-regex #"\.PrivateBrowsing-")
-    (ipc-posix-name-regex #"^Private WebKit Session-"))
+    (ipc-posix-name-regex #"^WebKit Test-"))
 
 ;; ColorSync
 ;; FIXME: Remove names with underscores when possible (see <rdar://problem/13072721>).