<!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>[195147] trunk/LayoutTests</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/195147">195147</a></dd>
<dt>Author</dt> <dd>commit-queue@webkit.org</dd>
<dt>Date</dt> <dd>2016-01-15 14:21:41 -0800 (Fri, 15 Jan 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>LayoutTest inspector/script-profiler/event-type-Other.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=153016
<rdar://problem/24192919>
Patch by Joseph Pecoraro <pecoraro@apple.com> on 2016-01-15
Reviewed by Brian Burg.
Introduce a better way for the inspected page to signal to
the inspector page by dispatching an event with JSON data.
Use it in this test to try to eliminate flakyness.
* http/tests/inspector/resources/inspector-test.js:
(TestPage.dispatchEventToFrontend):
* http/tests/inspector/resources/protocol-test.js:
(TestPage.runTest.window.runTest):
(TestPage.dispatchEventToFrontend):
* inspector/script-profiler/event-type-Other.html:
* inspector/unit-tests/inspector-test-dispatch-event-to-frontend-expected.txt: Added.
* inspector/unit-tests/inspector-test-dispatch-event-to-frontend.html: Added.
* inspector/unit-tests/protocol-test-dispatch-event-to-frontend-expected.txt: Added.
* inspector/unit-tests/protocol-test-dispatch-event-to-frontend.html: Added.
* platform/mac/TestExpectations:</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorresourcesinspectortestjs">trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js</a></li>
<li><a href="#trunkLayoutTestshttptestsinspectorresourcesprotocoltestjs">trunk/LayoutTests/http/tests/inspector/resources/protocol-test.js</a></li>
<li><a href="#trunkLayoutTestsinspectorscriptprofilereventtypeOtherhtml">trunk/LayoutTests/inspector/script-profiler/event-type-Other.html</a></li>
<li><a href="#trunkLayoutTestsplatformmacTestExpectations">trunk/LayoutTests/platform/mac/TestExpectations</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsinspectorunittestsinspectortestdispatcheventtofrontendexpectedtxt">trunk/LayoutTests/inspector/unit-tests/inspector-test-dispatch-event-to-frontend-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsinspectortestdispatcheventtofrontendhtml">trunk/LayoutTests/inspector/unit-tests/inspector-test-dispatch-event-to-frontend.html</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsprotocoltestdispatcheventtofrontendexpectedtxt">trunk/LayoutTests/inspector/unit-tests/protocol-test-dispatch-event-to-frontend-expected.txt</a></li>
<li><a href="#trunkLayoutTestsinspectorunittestsprotocoltestdispatcheventtofrontendhtml">trunk/LayoutTests/inspector/unit-tests/protocol-test-dispatch-event-to-frontend.html</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (195146 => 195147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog 2016-01-15 21:49:33 UTC (rev 195146)
+++ trunk/LayoutTests/ChangeLog 2016-01-15 22:21:41 UTC (rev 195147)
</span><span class="lines">@@ -1,3 +1,27 @@
</span><ins>+2016-01-15 Joseph Pecoraro <pecoraro@apple.com>
+
+ LayoutTest inspector/script-profiler/event-type-Other.html is flaky
+ https://bugs.webkit.org/show_bug.cgi?id=153016
+ <rdar://problem/24192919>
+
+ Reviewed by Brian Burg.
+
+ Introduce a better way for the inspected page to signal to
+ the inspector page by dispatching an event with JSON data.
+ Use it in this test to try to eliminate flakyness.
+
+ * http/tests/inspector/resources/inspector-test.js:
+ (TestPage.dispatchEventToFrontend):
+ * http/tests/inspector/resources/protocol-test.js:
+ (TestPage.runTest.window.runTest):
+ (TestPage.dispatchEventToFrontend):
+ * inspector/script-profiler/event-type-Other.html:
+ * inspector/unit-tests/inspector-test-dispatch-event-to-frontend-expected.txt: Added.
+ * inspector/unit-tests/inspector-test-dispatch-event-to-frontend.html: Added.
+ * inspector/unit-tests/protocol-test-dispatch-event-to-frontend-expected.txt: Added.
+ * inspector/unit-tests/protocol-test-dispatch-event-to-frontend.html: Added.
+ * platform/mac/TestExpectations:
+
</ins><span class="cx"> 2016-01-15 Zalan Bujtas <zalan@apple.com>
</span><span class="cx">
</span><span class="cx"> ASSERTION FAILED: canHaveChildren() || canHaveGeneratedChildren() in WebCore::RenderElement::insertChildInternal
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorresourcesinspectortestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js (195146 => 195147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js 2016-01-15 21:49:33 UTC (rev 195146)
+++ trunk/LayoutTests/http/tests/inspector/resources/inspector-test.js 2016-01-15 22:21:41 UTC (rev 195147)
</span><span class="lines">@@ -139,6 +139,12 @@
</span><span class="cx"> this._resultElement.append(text, document.createElement("br"));
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+TestPage.dispatchEventToFrontend = function(eventName, data)
+{
+ let dispatchEventCodeString = `InspectorTest.dispatchEventToListeners(${JSON.stringify(eventName)}, ${JSON.stringify(data)});`;
+ testRunner.evaluateInWebInspector(dispatchEventCodeString);
+};
+
</ins><span class="cx"> TestPage.allowUncaughtExceptions = false;
</span><span class="cx"> TestPage.needToSanitizeUncaughtExceptionURLs = false;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsinspectorresourcesprotocoltestjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/inspector/resources/protocol-test.js (195146 => 195147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/inspector/resources/protocol-test.js 2016-01-15 21:49:33 UTC (rev 195146)
+++ trunk/LayoutTests/http/tests/inspector/resources/protocol-test.js 2016-01-15 22:21:41 UTC (rev 195147)
</span><span class="lines">@@ -117,12 +117,18 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- let inspectorFrontend = window.internals.openDummyInspectorFrontend(url);
- inspectorFrontend.addEventListener("load", (event) => {
</del><ins>+ TestPage.inspectorFrontend = window.internals.openDummyInspectorFrontend(url);
+ TestPage.inspectorFrontend.addEventListener("load", (event) => {
</ins><span class="cx"> let initializationCodeString = `(${runInitializationMethodsInFrontend.toString()})([${TestPage._initializers}]);`;
</span><span class="cx"> let testFunctionCodeString = `(${runTestMethodInFrontend.toString()})(${testFunction.toString()});`;
</span><span class="cx">
</span><del>- inspectorFrontend.postMessage(initializationCodeString, "*");
- inspectorFrontend.postMessage(testFunctionCodeString, "*");
</del><ins>+ TestPage.inspectorFrontend.postMessage(initializationCodeString, "*");
+ TestPage.inspectorFrontend.postMessage(testFunctionCodeString, "*");
</ins><span class="cx"> });
</span><span class="cx"> };
</span><ins>+
+TestPage.dispatchEventToFrontend = function(eventName, data)
+{
+ let dispatchEventCodeString = `ProtocolTest.dispatchEventToListeners(${JSON.stringify(eventName)}, ${JSON.stringify(data)});`;
+ TestPage.inspectorFrontend.postMessage(dispatchEventCodeString, "*");
+};
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorscriptprofilereventtypeOtherhtml"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/inspector/script-profiler/event-type-Other.html (195146 => 195147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/script-profiler/event-type-Other.html 2016-01-15 21:49:33 UTC (rev 195146)
+++ trunk/LayoutTests/inspector/script-profiler/event-type-Other.html 2016-01-15 22:21:41 UTC (rev 195147)
</span><span class="lines">@@ -18,6 +18,7 @@
</span><span class="cx"> function triggerTimerEvaluation() {
</span><span class="cx"> setTimeout(() => {
</span><span class="cx"> console.log("timer fired");
</span><ins>+ TestPage.dispatchEventToFrontend("TestPageTimerEvaluated");
</ins><span class="cx"> }, 0);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -49,7 +50,9 @@
</span><span class="cx"> ProtocolTest.evaluateInPage("triggerScriptEvaluation()");
</span><span class="cx"> ProtocolTest.evaluateInPage("triggerEventDispatchEvaluation()");
</span><span class="cx"> ProtocolTest.evaluateInPage("triggerTimerEvaluation()");
</span><del>- setTimeout(() => { InspectorProtocol.sendCommand("ScriptProfiler.stopTracking", {}); }, 50);
</del><ins>+ ProtocolTest.singleFireEventListener("TestPageTimerEvaluated", (event) => {
+ InspectorProtocol.sendCommand("ScriptProfiler.stopTracking", {});
+ });
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsinspectortestdispatcheventtofrontendexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/inspector-test-dispatch-event-to-frontend-expected.txt (0 => 195147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/inspector-test-dispatch-event-to-frontend-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/inspector-test-dispatch-event-to-frontend-expected.txt 2016-01-15 22:21:41 UTC (rev 195147)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+
+== Running test suite: InspectorTest.TestPage.dispatchEventToFrontend
+-- Running test case: InspectorTest.TestPage.dispatchEventToFrontend
+PASS: Received Event
+PASS: Event name should be the event dispatched.
+PASS: Event data should be included.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsinspectortestdispatcheventtofrontendhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/inspector-test-dispatch-event-to-frontend.html (0 => 195147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/inspector-test-dispatch-event-to-frontend.html (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/inspector-test-dispatch-event-to-frontend.html 2016-01-15 22:21:41 UTC (rev 195147)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/inspector-test.js"></script>
+<script>
+function test()
+{
+ let suite = InspectorTest.createAsyncSuite("InspectorTest.TestPage.dispatchEventToFrontend");
+
+ suite.addTestCase({
+ name: "InspectorTest.TestPage.dispatchEventToFrontend",
+ description: "Ensure TestPage.dispatchEventToFrontend works with an InspectorTest.",
+ test: (resolve, reject) => {
+ InspectorTest.evaluateInPage("TestPage.dispatchEventToFrontend('MyEvent', {count: 1})");
+ InspectorTest.singleFireEventListener("MyEvent", (event) => {
+ InspectorTest.pass("Received Event");
+ InspectorTest.expectThat(event.type === "MyEvent", "Event name should be the event dispatched.");
+ InspectorTest.expectThat(event.data.count === 1, "Event data should be included.");
+ resolve();
+ });
+ },
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onLoad="runTest()">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsprotocoltestdispatcheventtofrontendexpectedtxt"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/protocol-test-dispatch-event-to-frontend-expected.txt (0 => 195147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/protocol-test-dispatch-event-to-frontend-expected.txt (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/protocol-test-dispatch-event-to-frontend-expected.txt 2016-01-15 22:21:41 UTC (rev 195147)
</span><span class="lines">@@ -0,0 +1,7 @@
</span><ins>+
+== Running test suite: ProtocolTest.TestPage.dispatchEventToFrontend
+-- Running test case: ProtocolTest.TestPage.dispatchEventToFrontend
+PASS: Received Event
+PASS: Event name should be the event dispatched.
+PASS: Event data should be included.
+
</ins></span></pre></div>
<a id="trunkLayoutTestsinspectorunittestsprotocoltestdispatcheventtofrontendhtml"></a>
<div class="addfile"><h4>Added: trunk/LayoutTests/inspector/unit-tests/protocol-test-dispatch-event-to-frontend.html (0 => 195147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/inspector/unit-tests/protocol-test-dispatch-event-to-frontend.html (rev 0)
+++ trunk/LayoutTests/inspector/unit-tests/protocol-test-dispatch-event-to-frontend.html 2016-01-15 22:21:41 UTC (rev 195147)
</span><span class="lines">@@ -0,0 +1,30 @@
</span><ins>+<!doctype html>
+<html>
+<head>
+<script src="../../http/tests/inspector/resources/protocol-test.js"></script>
+<script>
+function test()
+{
+ let suite = ProtocolTest.createAsyncSuite("ProtocolTest.TestPage.dispatchEventToFrontend");
+
+ suite.addTestCase({
+ name: "ProtocolTest.TestPage.dispatchEventToFrontend",
+ description: "Ensure TestPage.dispatchEventToFrontend works with a ProtocolTest.",
+ test: (resolve, reject) => {
+ ProtocolTest.evaluateInPage("TestPage.dispatchEventToFrontend('MyEvent', {count: 1})");
+ ProtocolTest.singleFireEventListener("MyEvent", (event) => {
+ ProtocolTest.pass("Received Event");
+ ProtocolTest.expectThat(event.type === "MyEvent", "Event name should be the event dispatched.");
+ ProtocolTest.expectThat(event.data.count === 1, "Event data should be included.");
+ resolve();
+ });
+ },
+ });
+
+ suite.runTestCasesAndFinish();
+}
+</script>
+</head>
+<body onLoad="runTest()">
+</body>
+</html>
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacTestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac/TestExpectations (195146 => 195147)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac/TestExpectations 2016-01-15 21:49:33 UTC (rev 195146)
+++ trunk/LayoutTests/platform/mac/TestExpectations 2016-01-15 22:21:41 UTC (rev 195147)
</span><span class="lines">@@ -1241,8 +1241,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/152029 inspector/debugger/command-line-api-exception.html [ Pass Timeout ]
</span><span class="cx">
</span><del>-webkit.org/b/153016 inspector/script-profiler/event-type-Other.html [ Pass Failure ]
-
</del><span class="cx"> webkit.org/b/153108 [ Debug ] inspector/model/scope-chain-node.html [ Pass Timeout ]
</span><span class="cx">
</span><span class="cx"> # Colorspaces on CA OpenGL layers not available in Yosemite
</span></span></pre>
</div>
</div>
</body>
</html>