Title: [249704] trunk/Tools
- Revision
- 249704
- Author
- achristen...@apple.com
- Date
- 2019-09-09 21:30:39 -0700 (Mon, 09 Sep 2019)
Log Message
Fix iOS API tests after r249684
https://bugs.webkit.org/show_bug.cgi?id=201573
* TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:
(TestWebKitAPI::getWebSocketEventWebKitLegacy):
(TestWebKitAPI::TEST):
The web thread still exists :(
That makes iOS immediate failure results more like WK2, which is fine.
The point is that the connection fails somehow and the server sees a TLS failure, which the test verifies.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (249703 => 249704)
--- trunk/Tools/ChangeLog 2019-09-10 04:24:23 UTC (rev 249703)
+++ trunk/Tools/ChangeLog 2019-09-10 04:30:39 UTC (rev 249704)
@@ -1,3 +1,15 @@
+2019-09-09 Alex Christensen <achristen...@webkit.org>
+
+ Fix iOS API tests after r249684
+ https://bugs.webkit.org/show_bug.cgi?id=201573
+
+ * TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm:
+ (TestWebKitAPI::getWebSocketEventWebKitLegacy):
+ (TestWebKitAPI::TEST):
+ The web thread still exists :(
+ That makes iOS immediate failure results more like WK2, which is fine.
+ The point is that the connection fails somehow and the server sees a TLS failure, which the test verifies.
+
2019-09-09 Chris Dumez <cdu...@apple.com>
REGRESSION: http/tests/resourceLoadStatistics/do-not-capture-statistics-for-simple-top-navigations.html is frequently timing out on iOS EWS bots
Modified: trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm (249703 => 249704)
--- trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm 2019-09-10 04:24:23 UTC (rev 249703)
+++ trunk/Tools/TestWebKitAPI/Tests/WebKitCocoa/TLSDeprecation.mm 2019-09-10 04:30:39 UTC (rev 249704)
@@ -34,6 +34,11 @@
#import <WebKit/WebKit.h>
#import <wtf/RetainPtr.h>
+#if PLATFORM(IOS_FAMILY)
+#import <WebKit/WebUIKitSupport.h>
+#import <WebKit/WebCoreThread.h>
+#endif
+
@interface WebSocketDelegate : NSObject <WKUIDelegate, WebUIDelegate>
- (NSString *)waitForMessage;
@end
@@ -106,6 +111,10 @@
NSString *getWebSocketEventWebKitLegacy(bool clientAllowDeprecatedTLS, bool serverLimitTLS)
{
+#if PLATFORM(IOS_FAMILY)
+ WebKitInitialize();
+ WebThreadLock();
+#endif
Optional<uint16_t> maxServerTLSVersion;
if (serverLimitTLS)
maxServerTLSVersion = tls1_1;
@@ -141,7 +150,12 @@
TEST(WebKit, TLSVersionWebSocketWebKitLegacy2)
{
- EXPECT_WK_STREQ(getWebSocketEventWebKitLegacy(false, true), "close");
+#if PLATFORM(IOS_FAMILY)
+ const char* expected = "error: undefined";
+#else
+ const char* expected = "close";
+#endif
+ EXPECT_WK_STREQ(getWebSocketEventWebKitLegacy(false, true), expected);
}
TEST(WebKit, TLSVersionWebSocketWebKitLegacy3)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
