Skip to content

Commit

Permalink
Cherry-pick 0c1bf2e. rdar://122444342
Browse files Browse the repository at this point in the history
    Enable WKWebsiteDataStore.proxyConfigurations tests on iOS simulator
    https://bugs.webkit.org/show_bug.cgi?id=268888
    rdar://122444342

    Reviewed by Chris Dumez.

    * Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:

    Canonical link: https://commits.webkit.org/274219@main

Identifier: 272448.542@safari-7618.1.15.10-branch
  • Loading branch information
achristensen07 authored and MyahCobbs committed Feb 9, 2024
1 parent 3c3f438 commit 59de8c4
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,11 @@
#import <wtf/SoftLinking.h>
#import <wtf/text/StringConcatenateNumbers.h>

// FIXME: Try to re-enable on the simulator after rdar://110076935 is resolved
#if !PLATFORM(IOS_FAMILY_SIMULATOR)
#if HAVE(NW_PROXY_CONFIG)
SOFT_LINK_LIBRARY_OPTIONAL(libnetwork)
SOFT_LINK_OPTIONAL(libnetwork, nw_proxy_config_create_http_connect, nw_proxy_config_t, __cdecl, (nw_endpoint_t, nw_protocol_options_t))
SOFT_LINK_OPTIONAL(libnetwork, nw_proxy_config_create_socksv5, nw_proxy_config_t, __cdecl, (nw_endpoint_t))
#endif // HAVE(NW_PROXY_CONFIG)
#endif // !PLATFORM(IOS_FAMILY_SIMULATOR)

@interface ProxyDelegate : NSObject <WKNavigationDelegate, WKUIDelegate>
- (NSString *)waitForAlert;
Expand Down Expand Up @@ -165,8 +162,6 @@ HTTPServer server([](Connection connection) {
EXPECT_WK_STREQ([webView _test_waitForAlert], "success!");
}

// FIXME: Try to re-enable on the simulator after rdar://110076935 is resolved
#if !PLATFORM(IOS_FAMILY_SIMULATOR)
#if HAVE(NW_PROXY_CONFIG)
TEST(WebKit, HTTPSProxyAPI)
{
Expand Down Expand Up @@ -294,7 +289,6 @@ HTTPServer server([](Connection connection) {
EXPECT_WK_STREQ([webView _test_waitForAlert], "success!");
}
#endif // HAVE(NW_PROXY_CONFIG)
#endif // !PLATFORM(IOS_FAMILY_SIMULATOR)

static HTTPServer proxyAuthenticationServer()
{
Expand Down

0 comments on commit 59de8c4

Please sign in to comment.