Title: [226751] trunk
- Revision
- 226751
- Author
- [email protected]
- Date
- 2018-01-10 18:30:51 -0800 (Wed, 10 Jan 2018)
Log Message
Multiple http/wpt/beacon/contentextensions/ test are flaky.
https://bugs.webkit.org/show_bug.cgi?id=179256
<rdar://problem/35401978>
Reviewed by Alex Christensen.
Tools:
Update WebKitTestRunner to set a temporary path for content extensions so that its WKTR
instance gets its own folder to avoid conflicts and flakiness.
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformConfigureViewForTest):
LayoutTests:
Stop marking content extensions tests as flaky.
* platform/mac-wk2/TestExpectations:
Modified Paths
Diff
Modified: trunk/LayoutTests/ChangeLog (226750 => 226751)
--- trunk/LayoutTests/ChangeLog 2018-01-11 02:18:45 UTC (rev 226750)
+++ trunk/LayoutTests/ChangeLog 2018-01-11 02:30:51 UTC (rev 226751)
@@ -1,3 +1,15 @@
+2018-01-10 Chris Dumez <[email protected]>
+
+ Multiple http/wpt/beacon/contentextensions/ test are flaky.
+ https://bugs.webkit.org/show_bug.cgi?id=179256
+ <rdar://problem/35401978>
+
+ Reviewed by Alex Christensen.
+
+ Stop marking content extensions tests as flaky.
+
+ * platform/mac-wk2/TestExpectations:
+
2018-01-10 Tim Horton <[email protected]>
REGRESSION (r213590): Swipe from edge to go to previous page is significantly slower than tapping back button on Twitter
Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (226750 => 226751)
--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2018-01-11 02:18:45 UTC (rev 226750)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2018-01-11 02:30:51 UTC (rev 226751)
@@ -525,10 +525,12 @@
########################################
# Content Extensions tests must be enabled explicitly on mac-wk2.
-http/tests/contentextensions [ Pass Failure ]
-http/tests/websocket/tests/hybi/contentextensions [ Pass Failure ]
+http/tests/contentextensions [ Pass ]
+http/tests/websocket/tests/hybi/contentextensions [ Pass ]
+[ Sierra+ ] http/wpt/beacon/contentextensions [ Pass ]
+
+# The following tests are flaky.
webkit.org/b/179557 http/tests/websocket/tests/hybi/contentextensions/upgrade-worker.html [ Pass Failure ]
-webkit.org/b/179256 [ Sierra+ ] http/wpt/beacon/contentextensions [ Pass Failure ]
webkit.org/b/168081 http/tests/contentextensions/async-xhr-onerror.html [ Pass Timeout ]
webkit.org/b/146400 http/tests/contentextensions/character-set-basic-support.html [ Pass Failure ]
webkit.org/b/168082 [ Sierra ] http/tests/contentextensions/invalid-selector.html [ Pass ImageOnlyFailure ]
Modified: trunk/Tools/ChangeLog (226750 => 226751)
--- trunk/Tools/ChangeLog 2018-01-11 02:18:45 UTC (rev 226750)
+++ trunk/Tools/ChangeLog 2018-01-11 02:30:51 UTC (rev 226751)
@@ -1,3 +1,17 @@
+2018-01-10 Chris Dumez <[email protected]>
+
+ Multiple http/wpt/beacon/contentextensions/ test are flaky.
+ https://bugs.webkit.org/show_bug.cgi?id=179256
+ <rdar://problem/35401978>
+
+ Reviewed by Alex Christensen.
+
+ Update WebKitTestRunner to set a temporary path for content extensions so that its WKTR
+ instance gets its own folder to avoid conflicts and flakiness.
+
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::TestController::platformConfigureViewForTest):
+
2018-01-10 Tim Horton <[email protected]>
REGRESSION (r213590): Swipe from edge to go to previous page is significantly slower than tapping back button on Twitter
Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (226750 => 226751)
--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2018-01-11 02:18:45 UTC (rev 226750)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2018-01-11 02:30:51 UTC (rev 226751)
@@ -133,7 +133,15 @@
return;
__block bool doneCompiling = false;
- [[_WKUserContentExtensionStore defaultStore] compileContentExtensionForIdentifier:@"TestContentExtensions" encodedContentExtension:contentExtensionString completionHandler:^(_WKUserContentFilter *filter, NSError *error)
+
+ NSURL *tempDir;
+ if (const char* dumpRenderTreeTemp = libraryPathForTesting()) {
+ String temporaryFolder = String::fromUTF8(dumpRenderTreeTemp);
+ tempDir = [NSURL fileURLWithPath:[(NSString*)temporaryFolder stringByAppendingPathComponent:@"ContentExtensions"] isDirectory:YES];
+ } else
+ tempDir = [NSURL fileURLWithPath:[NSTemporaryDirectory() stringByAppendingPathComponent:@"ContentExtensions"] isDirectory:YES];
+
+ [[_WKUserContentExtensionStore storeWithURL:tempDir] compileContentExtensionForIdentifier:@"TestContentExtensions" encodedContentExtension:contentExtensionString completionHandler:^(_WKUserContentFilter *filter, NSError *error)
{
if (!error)
[mainWebView()->platformView().configuration.userContentController _addUserContentFilter:filter];
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
