Changeset 231999 in webkit


Ignore:
Timestamp:
May 19, 2018 1:57:02 PM (6 years ago)
Author:
sihui_liu@apple.com
Message:

Flaky API test WebKit.WKHTTPCookieStoreWithoutProcessPool: incorrect order of cookies
https://bugs.webkit.org/show_bug.cgi?id=185624
<rdar://problem/39111626>

Reviewed by Chris Dumez.

Modified expectation to make test more robust as cookies can be returned in different orders.

  • TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:

(-[CookieUIDelegate webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:]):
(TEST):

Location:
trunk/Tools
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Tools/ChangeLog

    r231993 r231999  
     12018-05-19  Sihui Liu  <sihui_liu@apple.com>
     2
     3        Flaky API test WebKit.WKHTTPCookieStoreWithoutProcessPool: incorrect order of cookies
     4        https://bugs.webkit.org/show_bug.cgi?id=185624
     5        <rdar://problem/39111626>
     6
     7        Reviewed by Chris Dumez.
     8
     9        Modified expectation to make test more robust as cookies can be returned in different orders.
     10
     11        * TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm:
     12        (-[CookieUIDelegate webView:runJavaScriptAlertPanelWithMessage:initiatedByFrame:completionHandler:]):
     13        (TEST):
     14
    1152018-05-18  Commit Queue  <commit-queue@webkit.org>
    216
  • trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKHTTPCookieStore.mm

    r231850 r231999  
    3434#import <WebKit/_WKWebsiteDataStoreConfiguration.h>
    3535#import <wtf/RetainPtr.h>
     36#import <wtf/text/WTFString.h>
    3637
    3738#if WK_API_ENABLED
     
    377378- (void)webView:(WKWebView *)webView runJavaScriptAlertPanelWithMessage:(NSString *)message initiatedByFrame:(WKFrameInfo *)frame completionHandler:(void (^)(void))completionHandler
    378379{
    379     EXPECT_STREQ("cookie:PersistentCookieName=CookieValue; SessionCookieName=CookieValue", message.UTF8String);
     380    auto cookies = String(message.UTF8String);
     381    ASSERT_TRUE(cookies == "PersistentCookieName=CookieValue; SessionCookieName=CookieValue" || cookies == "SessionCookieName=CookieValue; PersistentCookieName=CookieValue");
    380382    finished = true;
    381383    completionHandler();
     
    398400        NSHTTPCookieExpires: [NSDate distantFuture],
    399401    }];
    400     NSString *alertCookieHTML = @"<script>alert('cookie:'+document.cookie);</script>";
     402    NSString *alertCookieHTML = @"<script>alert(document.cookie);</script>";
    401403
    402404    // NonPersistentDataStore
Note: See TracChangeset for help on using the changeset viewer.