<!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>[244539] 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/244539">244539</a></dd>
<dt>Author</dt> <dd>youenn@apple.com</dd>
<dt>Date</dt> <dd>2019-04-23 08:36:58 -0700 (Tue, 23 Apr 2019)</dd>
</dl>

<h3>Log Message</h3>
<pre>REGRESSION (<a href="http://trac.webkit.org/projects/webkit/changeset/240727">r240727</a>) [ Mac iOS ] Layout Test http/tests/workers/service/basic-register-exceptions.html is flaky
https://bugs.webkit.org/show_bug.cgi?id=194368
<rdar://problem/47937467>

Reviewed by Alex Christensen.

Test was exiting sooner than the last registration was rejected.
Make sure that the test is run until the end in a more ordered way.

* http/tests/workers/service/basic-register-exceptions-expected.txt:
* http/tests/workers/service/resources/basic-register-exceptions.js:
(async.doTest):
(then): Deleted.
(catch): Deleted.
* platform/mac-wk2/TestExpectations:</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkLayoutTestsChangeLog">trunk/LayoutTests/ChangeLog</a></li>
<li><a href="#trunkLayoutTestshttptestsworkersservicebasicregisterexceptionsexpectedtxt">trunk/LayoutTests/http/tests/workers/service/basic-register-exceptions-expected.txt</a></li>
<li><a href="#trunkLayoutTestshttptestsworkersserviceresourcesbasicregisterexceptionsjs">trunk/LayoutTests/http/tests/workers/service/resources/basic-register-exceptions.js</a></li>
<li><a href="#trunkLayoutTestsplatformmacwk2TestExpectations">trunk/LayoutTests/platform/mac-wk2/TestExpectations</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkLayoutTestsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/ChangeLog (244538 => 244539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/ChangeLog      2019-04-23 10:47:45 UTC (rev 244538)
+++ trunk/LayoutTests/ChangeLog 2019-04-23 15:36:58 UTC (rev 244539)
</span><span class="lines">@@ -1,3 +1,21 @@
</span><ins>+2019-04-23  Youenn Fablet  <youenn@apple.com>
+
+        REGRESSION (r240727) [ Mac iOS ] Layout Test http/tests/workers/service/basic-register-exceptions.html is flaky
+        https://bugs.webkit.org/show_bug.cgi?id=194368
+        <rdar://problem/47937467>
+
+        Reviewed by Alex Christensen.
+
+        Test was exiting sooner than the last registration was rejected.
+        Make sure that the test is run until the end in a more ordered way.
+
+        * http/tests/workers/service/basic-register-exceptions-expected.txt:
+        * http/tests/workers/service/resources/basic-register-exceptions.js:
+        (async.doTest):
+        (then): Deleted.
+        (catch): Deleted.
+        * platform/mac-wk2/TestExpectations:
+
</ins><span class="cx"> 2019-04-23  Carlos Garcia Campos  <cgarcia@igalia.com>
</span><span class="cx"> 
</span><span class="cx">         [ATK] Implement AtkComponentIface scroll_to methods
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsworkersservicebasicregisterexceptionsexpectedtxt"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/workers/service/basic-register-exceptions-expected.txt (244538 => 244539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/workers/service/basic-register-exceptions-expected.txt      2019-04-23 10:47:45 UTC (rev 244538)
+++ trunk/LayoutTests/http/tests/workers/service/basic-register-exceptions-expected.txt 2019-04-23 15:36:58 UTC (rev 244539)
</span><span class="lines">@@ -1,9 +1,10 @@
</span><del>-CONSOLE MESSAGE: line 20: Registration failed with error: TypeError: serviceWorker.register() cannot be called with an empty script URL
-CONSOLE MESSAGE: line 30: Registration failed with error: TypeError: serviceWorker.register() must be called with a valid relative script URL
-CONSOLE MESSAGE: line 40: Registration failed with error: TypeError: serviceWorker.register() must be called with a script URL whose protocol is either HTTP or HTTPS
-CONSOLE MESSAGE: line 50: Registration failed with error: TypeError: serviceWorker.register() must be called with a script URL whose path does not contain '%2f' or '%5c'
-CONSOLE MESSAGE: line 60: Registration failed with error: TypeError: Scope URL provided to serviceWorker.register() must be either HTTP or HTTPS
-CONSOLE MESSAGE: line 70: Registration failed with error: TypeError: Scope URL provided to serviceWorker.register() cannot have a path that contains '%2f' or '%5c'
-CONSOLE MESSAGE: line 80: Registration failed with error: SecurityError: Script origin does not match the registering client's origin
-CONSOLE MESSAGE: line 91: Registration failed with error: SecurityError: Scope origin does not match the registering client's origin
</del><ins>+CONSOLE MESSAGE: line 24: Registration failed with error: TypeError: Script http://127.0.0.1:8000/workers/service/image-mime-type.php load failed
+CONSOLE MESSAGE: line 24: Registration failed with error: TypeError: serviceWorker.register() cannot be called with an empty script URL
+CONSOLE MESSAGE: line 24: Registration failed with error: TypeError: serviceWorker.register() must be called with a valid relative script URL
+CONSOLE MESSAGE: line 24: Registration failed with error: TypeError: serviceWorker.register() must be called with a script URL whose protocol is either HTTP or HTTPS
+CONSOLE MESSAGE: line 24: Registration failed with error: TypeError: serviceWorker.register() must be called with a script URL whose path does not contain '%2f' or '%5c'
+CONSOLE MESSAGE: line 24: Registration failed with error: TypeError: Scope URL provided to serviceWorker.register() must be either HTTP or HTTPS
+CONSOLE MESSAGE: line 24: Registration failed with error: TypeError: Scope URL provided to serviceWorker.register() cannot have a path that contains '%2f' or '%5c'
+CONSOLE MESSAGE: line 24: Registration failed with error: SecurityError: Script origin does not match the registering client's origin
+CONSOLE MESSAGE: line 24: Registration failed with error: SecurityError: Scope origin does not match the registering client's origin
</ins><span class="cx"> 
</span></span></pre></div>
<a id="trunkLayoutTestshttptestsworkersserviceresourcesbasicregisterexceptionsjs"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/http/tests/workers/service/resources/basic-register-exceptions.js (244538 => 244539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/http/tests/workers/service/resources/basic-register-exceptions.js      2019-04-23 10:47:45 UTC (rev 244538)
+++ trunk/LayoutTests/http/tests/workers/service/resources/basic-register-exceptions.js 2019-04-23 15:36:58 UTC (rev 244539)
</span><span class="lines">@@ -3,95 +3,30 @@
</span><span class="cx">     finishSWTest();
</span><span class="cx"> }
</span><span class="cx"> 
</span><del>-navigator.serviceWorker.register("image-mime-type.php", { })
-.then(function(r) {
-       console.log("Registered! (unexpectedly)");
-}, function(e) {
-       console.log("Registration failed with error: " + e);
-})
-.catch(function(e) {
-       console.log("Exception registering: " + e);
-});
</del><ins>+var registrations = [
+    ["image-mime-type.php", {}],
+    ["", {}],
+    ["http://127.0.0.1:abc", {}],
+    ["somescheme://script.js", { }],
+    ["resources/%2fscript.js", { }],
+    ["resources/script.js", { scope: "somescheme://script.js" }],
+    ["resources/script.js", { scope: "%2fscript.js" }],
+    ["http://localhost:8000/workers/service/resources/empty-worker.js", { }],
+    ["resources/empty-worker.js", { scope: "http://localhost:8000/workers/service/" }]
+];
</ins><span class="cx"> 
</span><del>-navigator.serviceWorker.register("", { })
-.then(function(r) {
-       console.log("Registered! (unexpectedly)");
-}, function(e) {
-       console.log("Registration failed with error: " + e);
-})
-.catch(function(e) {
-       console.log("Exception registering: " + e);
-});
</del><ins>+async function doTest()
+{
+    for (let registration of registrations) {
+        await navigator.serviceWorker.register(registration[0], registration[1]).then(function(r) {
+            console.log("Registered! (unexpectedly)");
+        }, function(e) {
+            console.log("Registration failed with error: " + e);
+        }).catch(function(e) {
+            console.log("Exception registering: " + e);i
+        });
+    }
+    finishSWTest();
+}
</ins><span class="cx"> 
</span><del>-navigator.serviceWorker.register("http://127.0.0.1:abc", { })
-.then(function(r) {
-       console.log("Registered! (unexpectedly)");
-}, function(e) {
-       console.log("Registration failed with error: " + e);
-})
-.catch(function(e) {
-       console.log("Exception registering: " + e);
-});
-
-navigator.serviceWorker.register("somescheme://script.js", { })
-.then(function(r) {
-       console.log("Registered! (unexpectedly)");
-}, function(e) {
-       console.log("Registration failed with error: " + e);
-})
-.catch(function(e) {
-       console.log("Exception registering: " + e);
-});
-
-navigator.serviceWorker.register("resources/%2fscript.js", { })
-.then(function(r) {
-       console.log("Registered! (unexpectedly)");
-}, function(e) {
-       console.log("Registration failed with error: " + e);
-})
-.catch(function(e) {
-       console.log("Exception registering: " + e);
-});
-
-navigator.serviceWorker.register("resources/script.js", { scope: "somescheme://script.js" })
-.then(function(r) {
-       console.log("Registered! (unexpectedly)");
-}, function(e) {
-       console.log("Registration failed with error: " + e);
-})
-.catch(function(e) {
-       console.log("Exception registering: " + e);
-});
-
-navigator.serviceWorker.register("resources/script.js", { scope: "%2fscript.js" })
-.then(function(r) {
-       console.log("Registered! (unexpectedly)");
-}, function(e) {
-       console.log("Registration failed with error: " + e);
-})
-.catch(function(e) {
-       console.log("Exception registering: " + e);
-});
-
-navigator.serviceWorker.register("http://localhost:8000/workers/service/resources/empty-worker.js", { })
-.then(function(r) {
-       console.log("Registered! (unexpectedly)");
-}, function(e) {
-       console.log("Registration failed with error: " + e);
-})
-.catch(function(e) {
-       console.log("Exception registering: " + e);
-});
-
-navigator.serviceWorker.register("resources/empty-worker.js", { scope: "http://localhost:8000/workers/service/" })
-.then(function(r) {
-       console.log("Registered! (unexpectedly)");
-       done();
-}, function(e) {
-       console.log("Registration failed with error: " + e);
-       done();
-})
-.catch(function(e) {
-       console.log("Exception registering: " + e);
-       done();
-});
</del><ins>+doTest();
</ins></span></pre></div>
<a id="trunkLayoutTestsplatformmacwk2TestExpectations"></a>
<div class="modfile"><h4>Modified: trunk/LayoutTests/platform/mac-wk2/TestExpectations (244538 => 244539)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/LayoutTests/platform/mac-wk2/TestExpectations      2019-04-23 10:47:45 UTC (rev 244538)
+++ trunk/LayoutTests/platform/mac-wk2/TestExpectations 2019-04-23 15:36:58 UTC (rev 244539)
</span><span class="lines">@@ -913,8 +913,6 @@
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/194826 http/tests/resourceLoadStatistics/do-not-block-top-level-navigation-redirect.html [ Pass Timeout ]
</span><span class="cx"> 
</span><del>-webkit.org/b/194368 http/tests/workers/service/basic-register-exceptions.html [ Pass Failure ]
-
</del><span class="cx"> webkit.org/b/194253 scrollingcoordinator/scrolling-tree/fixed-inside-frame.html [ Pass Failure ]
</span><span class="cx"> 
</span><span class="cx"> webkit.org/b/194916 fast/mediastream/MediaStream-video-element.html [ Pass Failure ]
</span></span></pre>
</div>
</div>

</body>
</html>