<!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>[210705] branches/safari-603-branch/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/210705">210705</a></dd>
<dt>Author</dt> <dd>matthew_hanson@apple.com</dd>
<dt>Date</dt> <dd>2017-01-12 22:10:17 -0800 (Thu, 12 Jan 2017)</dd>
</dl>
<h3>Log Message</h3>
<pre>Merge <a href="http://trac.webkit.org/projects/webkit/changeset/210611">r210611</a>. rdar://problem/29471892</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#branchessafari603branchLayoutTestsChangeLog">branches/safari-603-branch/LayoutTests/ChangeLog</a></li>
<li><a href="#branchessafari603branchLayoutTestsinspectordebuggercspexceptionsexpectedtxt">branches/safari-603-branch/LayoutTests/inspector/debugger/csp-exceptions-expected.txt</a></li>
<li><a href="#branchessafari603branchLayoutTestsinspectordebuggercspexceptionshtml">branches/safari-603-branch/LayoutTests/inspector/debugger/csp-exceptions.html</a></li>
<li><a href="#branchessafari603branchLayoutTestsinspectordebuggerresourcescspexceptioniframehtml">branches/safari-603-branch/LayoutTests/inspector/debugger/resources/csp-exception-iframe.html</a></li>
<li><a href="#branchessafari603branchLayoutTestsplatformmacwk2TestExpectations">branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="branchessafari603branchLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/ChangeLog (210704 => 210705)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-13 06:10:15 UTC (rev 210704)
+++ branches/safari-603-branch/LayoutTests/ChangeLog 2017-01-13 06:10:17 UTC (rev 210705)
</span><span class="lines">@@ -1,5 +1,26 @@
</span><span class="cx"> 2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
</span><span class="cx">
</span><ins>+ Merge r210611. rdar://problem/29471892
+
+ 2017-01-11 Joseph Pecoraro <pecoraro@apple.com>
+
+ REGRESSION: LayoutTest inspector/debugger/csp-exceptions.html is a flaky failure
+ https://bugs.webkit.org/show_bug.cgi?id=165292
+ <rdar://problem/29471892>
+
+ Reviewed by Geoffrey Garen.
+
+ * inspector/debugger/csp-exceptions-expected.txt:
+ * inspector/debugger/csp-exceptions.html:
+ * inspector/debugger/resources/csp-exception-iframe.html:
+ Improve the test to handle all console messages more carefully,
+ including outputing the console messages to test them as well.
+
+ * platform/mac-wk2/TestExpectations:
+ Unskip the test, it should no longer be flakey.
+
+2017-01-12 Matthew Hanson <matthew_hanson@apple.com>
+
</ins><span class="cx"> Merge r210610. rdar://problem/15307582
</span><span class="cx">
</span><span class="cx"> 2017-01-11 Brent Fulgham <bfulgham@apple.com>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsinspectordebuggercspexceptionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/inspector/debugger/csp-exceptions-expected.txt (210704 => 210705)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/inspector/debugger/csp-exceptions-expected.txt 2017-01-13 06:10:15 UTC (rev 210704)
+++ branches/safari-603-branch/LayoutTests/inspector/debugger/csp-exceptions-expected.txt 2017-01-13 06:10:17 UTC (rev 210705)
</span><span class="lines">@@ -9,7 +9,10 @@
</span><span class="cx"> PASS: CSP Exception caused by script evaluation should pause.
</span><span class="cx"> Uncaught exception in test page: EvalError: Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of script in the following Content Security Policy directive: "script-src 'self' 'unsafe-inline'".
</span><span class="cx"> [csp-exceptions.html:11]
</span><ins>+PASS: CSP Exception Console Message: EvalError: Refused to evaluate a string as JavaScript because 'unsafe-eval' is not an allowed source of script in the following Content Security Policy directive: "script-src 'self' 'unsafe-inline'".
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> -- Running test case: TriggerCSPExceptionOutsideOfScript
</span><span class="cx"> PASS: CSP Exception caused outside of script evaluation should not pause.
</span><ins>+PASS: CSP Exception Console Message: Refused to execute a script because its hash, its nonce, or 'unsafe-inline' does not appear in the script-src directive of the Content Security Policy.
</ins><span class="cx">
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsinspectordebuggercspexceptionshtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/inspector/debugger/csp-exceptions.html (210704 => 210705)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/inspector/debugger/csp-exceptions.html 2017-01-13 06:10:15 UTC (rev 210704)
+++ branches/safari-603-branch/LayoutTests/inspector/debugger/csp-exceptions.html 2017-01-13 06:10:17 UTC (rev 210705)
</span><span class="lines">@@ -8,7 +8,7 @@
</span><span class="cx"> TestPage.needToSanitizeUncaughtExceptionURLs = true;
</span><span class="cx">
</span><span class="cx"> function triggerCSPExceptionInsideScript() {
</span><del>- eval("console.log('CSP should prevent this')");
</del><ins>+ eval("console.log('Inside Script - CSP should prevent this')");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function triggerCSPExceptionOutsideScript() {
</span><span class="lines">@@ -28,8 +28,14 @@
</span><span class="cx"> InspectorTest.evaluateInPage("setTimeout(triggerCSPExceptionInsideScript)");
</span><span class="cx"> WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Paused, (event) => {
</span><span class="cx"> InspectorTest.pass("CSP Exception caused by script evaluation should pause.");
</span><del>- WebInspector.debuggerManager.resume().then(resolve, reject);
</del><ins>+ WebInspector.debuggerManager.resume();
</ins><span class="cx"> });
</span><ins>+
+ WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
+ InspectorTest.assert(event.data.message.level === WebInspector.ConsoleMessage.MessageLevel.Error);
+ InspectorTest.pass("CSP Exception Console Message: " + event.data.message.messageText);
+ resolve();
+ });
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -38,14 +44,18 @@
</span><span class="cx"> description: "Trigger a CSP Exception outside of script should not pause or crash.",
</span><span class="cx"> test(resolve, reject) {
</span><span class="cx"> InspectorTest.evaluateInPage("setTimeout(triggerCSPExceptionOutsideScript)");
</span><ins>+ let didPause = false;
</ins><span class="cx"> let tempPauseFailListener = WebInspector.debuggerManager.singleFireEventListener(WebInspector.DebuggerManager.Event.Paused, (event) => {
</span><ins>+ didPause = true;
</ins><span class="cx"> InspectorTest.fail("CSP Exception caused outside of script evaluation should not pause, but did.");
</span><span class="cx"> WebInspector.debuggerManager.resume();
</span><span class="cx"> reject();
</span><span class="cx"> });
</span><del>- WebInspector.logManager.addEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</del><ins>+ WebInspector.logManager.singleFireEventListener(WebInspector.LogManager.Event.MessageAdded, (event) => {
</ins><span class="cx"> WebInspector.debuggerManager.removeEventListener(WebInspector.DebuggerManager.Event.Paused, tempPauseFailListener, null);
</span><del>- InspectorTest.pass("CSP Exception caused outside of script evaluation should not pause.");
</del><ins>+ InspectorTest.assert(event.data.message.level === WebInspector.ConsoleMessage.MessageLevel.Error);
+ InspectorTest.expectFalse(didPause, "CSP Exception caused outside of script evaluation should not pause.");
+ InspectorTest.pass("CSP Exception Console Message: " + event.data.message.messageText);
</ins><span class="cx"> resolve();
</span><span class="cx"> });
</span><span class="cx"> }
</span><span class="lines">@@ -52,6 +62,7 @@
</span><span class="cx"> });
</span><span class="cx">
</span><span class="cx"> DebuggerAgent.setPauseOnExceptions("all");
</span><ins>+
</ins><span class="cx"> suite.runTestCasesAndFinish();
</span><span class="cx"> }
</span><span class="cx"> </script>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsinspectordebuggerresourcescspexceptioniframehtml"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/inspector/debugger/resources/csp-exception-iframe.html (210704 => 210705)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/inspector/debugger/resources/csp-exception-iframe.html 2017-01-13 06:10:15 UTC (rev 210704)
+++ branches/safari-603-branch/LayoutTests/inspector/debugger/resources/csp-exception-iframe.html 2017-01-13 06:10:17 UTC (rev 210705)
</span><span class="lines">@@ -4,6 +4,6 @@
</span><span class="cx"> <meta http-equiv="Content-Security-Policy" content="script-src 'none'">
</span><span class="cx"> </head>
</span><span class="cx"> <body>
</span><del>-<script>console.log("CSP should prevent this");</script>
</del><ins>+<script>console.log("Inside Frame - CSP should prevent this");</script>
</ins><span class="cx"> </body>
</span><span class="cx"> </html>
</span></span></pre></div>
<a id="branchessafari603branchLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations (210704 => 210705)</h4>
<pre class="diff"><span>
<span class="info">--- branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations 2017-01-13 06:10:15 UTC (rev 210704)
+++ branches/safari-603-branch/LayoutTests/platform/mac-wk2/TestExpectations 2017-01-13 06:10:17 UTC (rev 210705)
</span><span class="lines">@@ -546,7 +546,6 @@
</span><span class="cx">
</span><span class="cx"> webkit.org/b/163604 inspector/debugger/breakpoint-action-eval.html [ Pass Timeout ]
</span><span class="cx"> webkit.org/b/161774 inspector/debugger/breakpoint-columns.html [ Pass Failure ]
</span><del>-webkit.org/b/165292 inspector/debugger/csp-exceptions.html [ Pass Failure ]
</del><span class="cx"> webkit.org/b/159447 [ Debug ] inspector/debugger/tail-deleted-frames-from-vm-entry.html [ Pass Failure ]
</span><span class="cx"> webkit.org/b/165582 inspector/worker/debugger-scripts.html [ Pass Failure ]
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>