Title: [287283] branches/safari-612-branch/Tools
- Revision
- 287283
- Author
- jen...@apple.com
- Date
- 2021-12-20 15:25:33 -0800 (Mon, 20 Dec 2021)
Log Message
Fix for Cherry-pick r284133.
https://bugs.webkit.org/show_bug.cgi?id=231700
Unreviewed test gardening.
Remove unintedned "<<<<<<< HEAD" entries in file from cherry pick that could break the build.
* TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm:
(TEST):
Modified Paths
Diff
Modified: branches/safari-612-branch/Tools/ChangeLog (287282 => 287283)
--- branches/safari-612-branch/Tools/ChangeLog 2021-12-20 23:24:04 UTC (rev 287282)
+++ branches/safari-612-branch/Tools/ChangeLog 2021-12-20 23:25:33 UTC (rev 287283)
@@ -1,5 +1,17 @@
2021-12-20 Robert Jenner <jen...@apple.com>
+ Fix for Cherry-pick r284133.
+ https://bugs.webkit.org/show_bug.cgi?id=231700
+
+ Unreviewed test gardening.
+
+ Remove unintedned "<<<<<<< HEAD" entries in file from cherry pick that could break the build.
+
+ * TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm:
+ (TEST):
+
+2021-12-20 Robert Jenner <jen...@apple.com>
+
Cherry-pick r284133. rdar://problem/84224737
Disable failing API tests
Modified: branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm (287282 => 287283)
--- branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm 2021-12-20 23:24:04 UTC (rev 287282)
+++ branches/safari-612-branch/Tools/TestWebKitAPI/Tests/WebKitCocoa/ResourceLoadStatistics.mm 2021-12-20 23:25:33 UTC (rev 287283)
@@ -509,9 +509,8 @@
@end
-<<<<<<< HEAD
+
#if HAVE(SSL)
-=======
void waitUntilTwoServersConnected(const unsigned& serversConnected, CompletionHandler<void()>&& completionHandler)
{
if (serversConnected >= 2) {
@@ -525,7 +524,6 @@
// 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;
@@ -596,12 +594,9 @@
EXPECT_TRUE(contains(messages, @"1"));
EXPECT_TRUE(contains(messages, @"2"));
}
-<<<<<<< HEAD
#endif // HAVE(SSL)
-=======
-#endif
->>>>>>> 03cb852f3ba2 (Disable failing API tests)
+
TEST(ResourceLoadStatistics, NoMessagesWhenNotTesting)
{
auto configuration = adoptNS([[WKWebViewConfiguration alloc] init]);
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
