Diff
Modified: branches/safari-612-branch/Tools/ChangeLog (287279 => 287280)
--- branches/safari-612-branch/Tools/ChangeLog 2021-12-20 22:14:50 UTC (rev 287279)
+++ branches/safari-612-branch/Tools/ChangeLog 2021-12-20 22:55:58 UTC (rev 287280)
@@ -1,3 +1,37 @@
+2021-12-20 Robert Jenner <jen...@apple.com>
+
+ Cherry-pick r284133. rdar://problem/84224737
+
+ Disable failing API tests
+ https://bugs.webkit.org/show_bug.cgi?id=231700
+
+ Unreviewed test gardening.
+
+ * TestWebKitAPI/Tests/WTF/cocoa/URLExtras.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewDoesNotLogDuringInitialization.mm:
+ * TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm:
+
+ git-svn-id: https://svn.webkit.org/repository/webkit/trunk@284133 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+ 2021-10-13 Ryan Haddad <ryanhad...@apple.com>
+
+ Disable failing API tests
+ https://bugs.webkit.org/show_bug.cgi?id=231700
+
+ Unreviewed test gardening.
+
+ * TestWebKitAPI/Tests/WTF/cocoa/URLExtras.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm:
+ * TestWebKitAPI/Tests/WebKitCocoa/WKWebViewDoesNotLogDuringInitialization.mm:
+ * TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm:
+
2021-12-06 Alan Coon <alanc...@apple.com>
Cherry-pick r286537. rdar://problem/85928816
Modified: branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WTF/cocoa/URLExtras.mm (287279 => 287280)
--- branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WTF/cocoa/URLExtras.mm 2021-12-20 22:14:50 UTC (rev 287279)
+++ branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WTF/cocoa/URLExtras.mm 2021-12-20 22:55:58 UTC (rev 287280)
@@ -66,6 +66,8 @@
return WTF::URLWithData(literalAsData(literal), nil);
}
+// FIXME: Re-enable this test once webkit.org/b/231454 is resolved.
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000)
TEST(WTF_URLExtras, URLExtras)
{
EXPECT_STREQ("http://site.com", originalDataAsString(literalURL("http://site.com")));
@@ -81,6 +83,7 @@
EXPECT_STREQ(".example.com", [WTF::decodeHostName(@"xn--.example.com") UTF8String]);
EXPECT_STREQ("a..example.com", [WTF::decodeHostName(@"a..example.com") UTF8String]);
}
+#endif
TEST(WTF_URLExtras, URLExtras_Spoof)
{
Modified: branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm (287279 => 287280)
--- branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm 2021-12-20 22:14:50 UTC (rev 287279)
+++ branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/Challenge.mm 2021-12-20 22:55:58 UTC (rev 287280)
@@ -523,6 +523,8 @@
namespace TestWebKitAPI {
+// FIXME: Re-enable these tests once webkit.org/b/231320 is resolved.
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000)
TEST(WebKit, ServerTrust)
{
TCPServer server(TCPServer::Protocol::HTTPS, [] (SSL* ssl) {
@@ -574,6 +576,7 @@
EXPECT_EQ([delegate authenticationChallengeCount], 0ull);
#endif
}
+#endif // (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000)
TEST(WebKit, ErrorSecureCoding)
{
Modified: branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm (287279 => 287280)
--- branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm 2021-12-20 22:14:50 UTC (rev 287279)
+++ branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/Proxy.mm 2021-12-20 22:55:58 UTC (rev 287280)
@@ -76,6 +76,8 @@
namespace TestWebKitAPI {
+// FIXME: Re-enable this test once webkit.org/b/231396 is resolved.
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000
TEST(WebKit, HTTPSProxy)
{
TCPServer server(TCPServer::Protocol::HTTPSProxy, TCPServer::respondWithOK);
@@ -93,6 +95,7 @@
[webView loadRequest:[NSURLRequest requestWithURL:[NSURL URLWithString:@"https://example.com/"]]];
EXPECT_WK_STREQ([delegate waitForAlert], "success!");
}
+#endif
TEST(WebKit, SOCKS5)
{
Modified: branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm (287279 => 287280)
--- branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm 2021-12-20 22:14:50 UTC (rev 287279)
+++ branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm 2021-12-20 22:55:58 UTC (rev 287280)
@@ -509,7 +509,23 @@
@end
+<<<<<<< HEAD
#if HAVE(SSL)
+=======
+void waitUntilTwoServersConnected(const unsigned& serversConnected, CompletionHandler<void()>&& completionHandler)
+{
+ if (serversConnected >= 2) {
+ completionHandler();
+ return;
+ }
+ dispatch_async(dispatch_get_main_queue(), makeBlockPtr([&serversConnected, completionHandler = WTFMove(completionHandler)] () mutable {
+ waitUntilTwoServersConnected(serversConnected, WTFMove(completionHandler));
+ }).get());
+}
+
+// FIXME: Re-enable this test once webkit.org/b/231366 is resolved.
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000
+>>>>>>> 03cb852f3ba2 (Disable failing API tests)
TEST(ResourceLoadStatistics, DataTaskIdentifierCollision)
{
using namespace TestWebKitAPI;
@@ -580,7 +596,11 @@
EXPECT_TRUE(contains(messages, @"1"));
EXPECT_TRUE(contains(messages, @"2"));
}
+<<<<<<< HEAD
#endif // HAVE(SSL)
+=======
+#endif
+>>>>>>> 03cb852f3ba2 (Disable failing API tests)
TEST(ResourceLoadStatistics, NoMessagesWhenNotTesting)
{
Modified: branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm (287279 => 287280)
--- branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm 2021-12-20 22:14:50 UTC (rev 287279)
+++ branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKURLSchemeHandler-1.mm 2021-12-20 22:55:58 UTC (rev 287280)
@@ -1571,6 +1571,8 @@
EXPECT_WK_STREQ(@"Document URL: redirectone://bar.com/anothertest.html", [lastScriptMessage body]);
}
+// FIXME: Re-enable this test once webkit.org/b/231394 is resolved.
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000)
TEST(URLSchemeHandler, Ranges)
{
RetainPtr<NSData> videoData = [NSData dataWithContentsOfURL:[[NSBundle mainBundle] URLForResource:@"test" withExtension:@"mp4" subdirectory:@"TestWebKitAPI.resources"]];
@@ -1620,6 +1622,7 @@
EXPECT_WK_STREQ([webView _test_waitForAlert], "playing");
EXPECT_TRUE(foundRangeRequest);
}
+#endif
TEST(URLSchemeHandler, HandleURLRewrittenByPlugIn)
{
Modified: branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewDoesNotLogDuringInitialization.mm (287279 => 287280)
--- branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewDoesNotLogDuringInitialization.mm 2021-12-20 22:14:50 UTC (rev 287279)
+++ branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/WKWebViewDoesNotLogDuringInitialization.mm 2021-12-20 22:55:58 UTC (rev 287280)
@@ -33,6 +33,8 @@
#import <fcntl.h>
#import <wtf/RetainPtr.h>
+// FIXME: Re-enable this test once webkit.org/b/231459 is resolved.
+#if (PLATFORM(MAC) && __MAC_OS_X_VERSION_MIN_REQUIRED < 120000) || (PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000)
TEST(WKWebView, InitializingWebViewWithEphemeralStorageDoesNotLog)
{
// Replace stderr with a nonblocking pipe that we can read from.
@@ -56,3 +58,4 @@
FAIL();
}
}
+#endif
Modified: branches/safari-612-branch/Tools/TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm (287279 => 287280)
--- branches/safari-612-branch/Tools/TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm 2021-12-20 22:14:50 UTC (rev 287279)
+++ branches/safari-612-branch/Tools/TestWebKitAPI/Tests/ios/WKWebViewPausePlayingAudioTests.mm 2021-12-20 22:55:58 UTC (rev 287280)
@@ -69,6 +69,8 @@
Util::run(&isPlaying);
}
+// FIXME: Re-enable this test once webkit.org/b/230321 is resolved.
+#if PLATFORM(IOS) && __IPHONE_OS_VERSION_MIN_REQUIRED < 150000
TEST(WKWebViewPausePlayingAudioTests, OutOfWindow)
{
auto webView = adoptNS([[TestWKWebView alloc] initWithFrame:NSMakeRect(0, 0, 100, 100) configuration:autoplayingConfiguration().get() addToWindow:YES]);
@@ -102,6 +104,7 @@
Util::run(&isPlaying);
}
+#endif
}
