Changeset 259745 in webkit

Timestamp:

Apr 8, 2020, 12:25:31 PM (6 years ago)

Author:

sihui_liu@apple.com

Message:

[macOS] TestWebKitAPI.WKHTTPCookieStore.WithoutProcessPoolDuplicates is failing
​https://bugs.webkit.org/show_bug.cgi?id=209992

Reviewed by Geoffrey Garen.

Make sure existing cookies are cleared before test. Otherwise, they will affect test result.

• TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:

(clearCookies):
(TEST):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2020-04-08  Sihui Liu  <sihui_liu@apple.com>
+
+        [macOS] TestWebKitAPI.WKHTTPCookieStore.WithoutProcessPoolDuplicates is failing
+        https://bugs.webkit.org/show_bug.cgi?id=209992
+
+        Reviewed by Geoffrey Garen.
+
+        Make sure existing cookies are cleared before test. Otherwise, they will affect test result.
+
+        * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
+        (clearCookies):
+        (TEST):
+
 2020-04-08  Kate Cheney  <katherine_cheney@apple.com>
 

trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm

@@ -635 +635 @@
 }
 
+static void clearCookies(WKHTTPCookieStore* cookieStore)
+{
+    finished = false;
+    [cookieStore getAllCookies:^(NSArray<NSHTTPCookie *> *cookies) {
+        if (!cookies || !cookies.count) {
+            finished = true;
+            return;
+        }
+
+        unsigned cookiesCount = cookies.count;
+        __block unsigned deletedCount = 0;
+        for (NSHTTPCookie* cookie in cookies) {
+            [cookieStore deleteCookie:cookie completionHandler:^{
+                if (++deletedCount == cookiesCount)
+                    finished = true;
+            }];
+        }
+    }];
+    TestWebKitAPI::Util::run(&finished);
+}
+
 TEST(WKHTTPCookieStore, WithoutProcessPoolDuplicates)
 {
@@ -651 +672 @@
     RetainPtr<NSHTTPCookie> sessionCookieDifferentValue = [NSHTTPCookie cookieWithProperties:properties.get()];
     finished = false;
-    
+
+    clearCookies(httpCookieStore.get());
+
     [httpCookieStore.get() setCookie:sessionCookie.get() completionHandler:^{
         finished = true;