Title: [121913] trunk
- Revision
- 121913
- Author
- [email protected]
- Date
- 2012-07-05 10:37:35 -0700 (Thu, 05 Jul 2012)
Log Message
[Mac][WK2] Enable HTTPS tests
https://bugs.webkit.org/show_bug.cgi?id=90600
Reviewed by Brady Eidson.
Tools:
* DumpRenderTree/mac/DumpRenderTree.mm: (dumpRenderTree): Removed a misleading comment.
It explained why we were doing this here instead of a frame load delegate, but that's
just history, not an explanation of why we need this code.
* WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm: (WTR::InjectedBundle::platformInitialize):
Ignore certificate errors for localhost and 127.0.0.1. Since this is only needed
for tests, it seems appropriate to have platform specific solutions in every WTR,
and not add a WebKit2 API.
LayoutTests:
Unskip in common wk2 skipped file, re-skip everywhere besides Mac.
* platform/gtk-wk2/Skipped:
* platform/qt-5.0-wk2/Skipped:
* platform/win-wk2/Skipped:
* platform/wk2/Skipped:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (121912 => 121913)
--- trunk/LayoutTests/ChangeLog 2012-07-05 17:19:13 UTC (rev 121912)
+++ trunk/LayoutTests/ChangeLog 2012-07-05 17:37:35 UTC (rev 121913)
@@ -1,3 +1,17 @@
+2012-07-05 Alexey Proskuryakov <[email protected]>
+
+ [Mac][WK2] Enable HTTPS tests
+ https://bugs.webkit.org/show_bug.cgi?id=90600
+
+ Reviewed by Brady Eidson.
+
+ Unskip in common wk2 skipped file, re-skip everywhere besides Mac.
+
+ * platform/gtk-wk2/Skipped:
+ * platform/qt-5.0-wk2/Skipped:
+ * platform/win-wk2/Skipped:
+ * platform/wk2/Skipped:
+
2012-07-05 Nate Chapin <[email protected]>
Test for https://bugs.webkit.org/show_bug.cgi?id=88436.
Modified: trunk/LayoutTests/platform/gtk-wk2/Skipped (121912 => 121913)
--- trunk/LayoutTests/platform/gtk-wk2/Skipped 2012-07-05 17:19:13 UTC (rev 121912)
+++ trunk/LayoutTests/platform/gtk-wk2/Skipped 2012-07-05 17:37:35 UTC (rev 121913)
@@ -320,6 +320,9 @@
http/tests/navigation/ping-cross-origin.html
http/tests/navigation/ping-cookie.html
+# WebKitTestRunner needs to allow self-signed certificates for localhost.
+http/tests/ssl
+
###############################################################################
# TESTS FAILING
###############################################################################
Modified: trunk/LayoutTests/platform/qt-5.0-wk2/Skipped (121912 => 121913)
--- trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-07-05 17:19:13 UTC (rev 121912)
+++ trunk/LayoutTests/platform/qt-5.0-wk2/Skipped 2012-07-05 17:37:35 UTC (rev 121913)
@@ -392,3 +392,6 @@
# https://bugs.webkit.org/show_bug.cgi?id=89473
editing/pasteboard/copy-in-password-field.html
editing/pasteboard/copy-element-with-conflicting-background-color-from-rule.html
+
+# WebKitTestRunner needs to allow self-signed certificates for localhost.
+http/tests/ssl
Modified: trunk/LayoutTests/platform/win-wk2/Skipped (121912 => 121913)
--- trunk/LayoutTests/platform/win-wk2/Skipped 2012-07-05 17:19:13 UTC (rev 121912)
+++ trunk/LayoutTests/platform/win-wk2/Skipped 2012-07-05 17:37:35 UTC (rev 121913)
@@ -949,3 +949,6 @@
# HiDPI tests require test infrastructure enhancements
fast/hidpi
+
+# WebKitTestRunner needs to allow self-signed certificates for localhost.
+http/tests/ssl
Modified: trunk/LayoutTests/platform/wk2/Skipped (121912 => 121913)
--- trunk/LayoutTests/platform/wk2/Skipped 2012-07-05 17:19:13 UTC (rev 121912)
+++ trunk/LayoutTests/platform/wk2/Skipped 2012-07-05 17:37:35 UTC (rev 121913)
@@ -1177,9 +1177,6 @@
http/tests/navigation/history-back-across-form-submission-to-fragment.html
http/tests/security/cross-frame-access-put.html
http/tests/security/originHeader/origin-header-for-https.html
-http/tests/ssl/referer-301.html
-http/tests/ssl/referer-303.html
-http/tests/ssl/verify-ssl-enabled.php
http/tests/storage/callbacks-are-called-in-correct-context.html
media/controls-after-reload.html
media/controls-styling.html
Modified: trunk/Tools/ChangeLog (121912 => 121913)
--- trunk/Tools/ChangeLog 2012-07-05 17:19:13 UTC (rev 121912)
+++ trunk/Tools/ChangeLog 2012-07-05 17:37:35 UTC (rev 121913)
@@ -1,3 +1,19 @@
+2012-07-05 Alexey Proskuryakov <[email protected]>
+
+ [Mac][WK2] Enable HTTPS tests
+ https://bugs.webkit.org/show_bug.cgi?id=90600
+
+ Reviewed by Brady Eidson.
+
+ * DumpRenderTree/mac/DumpRenderTree.mm: (dumpRenderTree): Removed a misleading comment.
+ It explained why we were doing this here instead of a frame load delegate, but that's
+ just history, not an explanation of why we need this code.
+
+ * WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm: (WTR::InjectedBundle::platformInitialize):
+ Ignore certificate errors for localhost and 127.0.0.1. Since this is only needed
+ for tests, it seems appropriate to have platform specific solutions in every WTR,
+ and not add a WebKit2 API.
+
2012-07-05 Tor Arne Vestbø <[email protected]>
[Qt] Remove rpath-hacks in qt_webkit.pri
Modified: trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm (121912 => 121913)
--- trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2012-07-05 17:19:13 UTC (rev 121912)
+++ trunk/Tools/DumpRenderTree/mac/DumpRenderTree.mm 2012-07-05 17:37:35 UTC (rev 121913)
@@ -862,8 +862,6 @@
[[NSURLCache sharedURLCache] removeAllCachedResponses];
[WebCache empty];
- // <http://webkit.org/b/31200> In order to prevent extra frame load delegate logging being generated if the first test to use SSL
- // is set to log frame load delegate calls we ignore SSL certificate errors on localhost and 127.0.0.1.
[NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"localhost"];
[NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"127.0.0.1"];
Modified: trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm (121912 => 121913)
--- trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2012-07-05 17:19:13 UTC (rev 121912)
+++ trunk/Tools/WebKitTestRunner/InjectedBundle/mac/InjectedBundleMac.mm 2012-07-05 17:37:35 UTC (rev 121913)
@@ -27,6 +27,11 @@
#import <Foundation/Foundation.h>
+@interface NSURLRequest (PrivateThingsWeShouldntReallyUse)
++(void)setAllowsAnyHTTPSCertificate:(BOOL)allow forHost:(NSString *)host;
+@end
+
+
namespace WTR {
void InjectedBundle::platformInitialize(WKTypeRef)
@@ -44,7 +49,10 @@
[NSArray arrayWithObject:@"en"], @"AppleLanguages",
nil];
- [[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgumentDomain];
+ [[NSUserDefaults standardUserDefaults] setVolatileDomain:dict forName:NSArgumentDomain];
+
+ [NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"localhost"];
+ [NSURLRequest setAllowsAnyHTTPSCertificate:YES forHost:@"127.0.0.1"];
}
} // namespace WTR
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
