<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[183020] trunk</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/183020">183020</a></dd>
<dt>Author</dt> <dd>achristensen@apple.com</dd>
<dt>Date</dt> <dd>2015-04-20 11:48:41 -0700 (Mon, 20 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix content extension test flakiness.
https://bugs.webkit.org/show_bug.cgi?id=143950
Reviewed by Brady Eidson.
Tools:
* WebKitTestRunner/mac/TestControllerMac.mm:
(WTR::TestController::platformResetPreferencesToConsistentValues):
Remove the TestContentExtensions if it exists.
(WTR::TestController::platformConfigureViewForTest):
Log errors in case there are any.
LayoutTests:
* platform/mac-wk2/TestExpectations:
Mark contentextensions tests as not flaky any more.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsWebKitTestRunnermacTestControllerMacmm">trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (183019 => 183020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2015-04-20 18:46:33 UTC (rev 183019)
+++ trunk/LayoutTests/ChangeLog 2015-04-20 18:48:41 UTC (rev 183020)
</span><span class="lines">@@ -1,3 +1,13 @@
</span><ins>+2015-04-20 Alex Christensen <achristensen@webkit.org>
+
+ Fix content extension test flakiness.
+ https://bugs.webkit.org/show_bug.cgi?id=143950
+
+ Reviewed by Brady Eidson.
+
+ * platform/mac-wk2/TestExpectations:
+ Mark contentextensions tests as not flaky any more.
+
</ins><span class="cx"> 2015-04-20 Beth Dakin <bdakin@apple.com>
</span><span class="cx">
</span><span class="cx"> Should not list these tests twice.
</span></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (183019 => 183020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations 2015-04-20 18:46:33 UTC (rev 183019)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2015-04-20 18:48:41 UTC (rev 183020)
</span><span class="lines">@@ -526,5 +526,4 @@
</span><span class="cx"> ### END OF (7) New WebKit2-only failures in Yosemite
</span><span class="cx"> ########################################
</span><span class="cx">
</span><del>-# Once flakiness is fixed, the expectation should be changed to [ Pass ], because these tests are disabled, and need to be re-enabled.
-webkit.org/b/143950 http/tests/contentextensions [ Pass Failure ]
</del><ins>+http/tests/contentextensions [ Pass ]
</ins></span></pre></div>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (183019 => 183020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog 2015-04-20 18:46:33 UTC (rev 183019)
+++ trunk/Tools/ChangeLog 2015-04-20 18:48:41 UTC (rev 183020)
</span><span class="lines">@@ -1,5 +1,18 @@
</span><span class="cx"> 2015-04-20 Alex Christensen <achristensen@webkit.org>
</span><span class="cx">
</span><ins>+ Fix content extension test flakiness.
+ https://bugs.webkit.org/show_bug.cgi?id=143950
+
+ Reviewed by Brady Eidson.
+
+ * WebKitTestRunner/mac/TestControllerMac.mm:
+ (WTR::TestController::platformResetPreferencesToConsistentValues):
+ Remove the TestContentExtensions if it exists.
+ (WTR::TestController::platformConfigureViewForTest):
+ Log errors in case there are any.
+
+2015-04-20 Alex Christensen <achristensen@webkit.org>
+
</ins><span class="cx"> Properly report errors from _WKUserContentExtensionStore.
</span><span class="cx"> https://bugs.webkit.org/show_bug.cgi?id=143808
</span><span class="cx">
</span></span></pre></div>
<a id="trunkToolsWebKitTestRunnermacTestControllerMacmm"></a>
<div class="modfile"><h4>Modified: trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm (183019 => 183020)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2015-04-20 18:46:33 UTC (rev 183019)
+++ trunk/Tools/WebKitTestRunner/mac/TestControllerMac.mm 2015-04-20 18:48:41 UTC (rev 183020)
</span><span class="lines">@@ -85,6 +85,14 @@
</span><span class="cx"> void TestController::platformResetPreferencesToConsistentValues()
</span><span class="cx"> {
</span><span class="cx"> #if WK_API_ENABLED
</span><ins>+ __block bool doneRemoving = false;
+ [[_WKUserContentExtensionStore defaultStore] removeContentExtensionForIdentifier:@"TestContentExtensions" completionHandler:^(NSError *error)
+ {
+ if (error)
+ NSLog(@"%@", [error helpAnchor]);
+ doneRemoving = true;
+ }];
+ platformRunUntil(doneRemoving, 0);
</ins><span class="cx"> [[_WKUserContentExtensionStore defaultStore] _removeAllContentExtensions];
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -114,14 +122,16 @@
</span><span class="cx"> return;
</span><span class="cx">
</span><span class="cx"> #if WK_API_ENABLED
</span><del>- __block bool done = false;
</del><ins>+ __block bool doneCompiling = false;
</ins><span class="cx"> [[_WKUserContentExtensionStore defaultStore] compileContentExtensionForIdentifier:@"TestContentExtensions" encodedContentExtension:contentExtensionString completionHandler:^(_WKUserContentFilter *filter, NSError *error)
</span><span class="cx"> {
</span><span class="cx"> if (!error)
</span><span class="cx"> WKPageGroupAddUserContentFilter(WKPageGetPageGroup(TestController::singleton().mainWebView()->page()), (__bridge WKUserContentFilterRef)filter);
</span><del>- done = true;
</del><ins>+ else
+ NSLog(@"%@", [error helpAnchor]);
+ doneCompiling = true;
</ins><span class="cx"> }];
</span><del>- platformRunUntil(done, 0);
</del><ins>+ platformRunUntil(doneCompiling, 0);
</ins><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>