Title: [226888] branches/safari-605-branch/LayoutTests

Diff

Modified: branches/safari-605-branch/LayoutTests/ChangeLog (226887 => 226888)


--- branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 15:21:42 UTC (rev 226887)
+++ branches/safari-605-branch/LayoutTests/ChangeLog	2018-01-12 15:21:46 UTC (rev 226888)
@@ -1,3 +1,18 @@
+2018-01-12  Jason Marcell  <[email protected]>
+
+        Cherry-pick r226771. rdar://problem/36450734
+
+    2018-01-11  Youenn Fablet  <[email protected]>
+
+            LayoutTests/http/tests/workers/service/resources/service-worker-importScript.js does not need to register two service workers
+            https://bugs.webkit.org/show_bug.cgi?id=181490
+
+            Reviewed by Chris Dumez.
+
+            * http/tests/workers/service/resources/service-worker-importScript.js:
+            * http/tests/workers/service/service-worker-importScript-expected.txt:
+            * platform/mac-wk2/TestExpectations:
+
 2018-01-11  Jason Marcell  <[email protected]>
 
         Cherry-pick r226731. rdar://problem/36450734

Modified: branches/safari-605-branch/LayoutTests/http/tests/workers/service/resources/service-worker-importScript.js (226887 => 226888)


--- branches/safari-605-branch/LayoutTests/http/tests/workers/service/resources/service-worker-importScript.js	2018-01-12 15:21:42 UTC (rev 226887)
+++ branches/safari-605-branch/LayoutTests/http/tests/workers/service/resources/service-worker-importScript.js	2018-01-12 15:21:46 UTC (rev 226888)
@@ -1,11 +1,7 @@
 async function test()
 {
     try {
-        log("Registering service worker");
-        await navigator.serviceWorker.register("resources/service-worker-importScript-worker.js", { });
-        log("Registered service worker");
-
-        var frame = await interceptedFrame("resources/service-worker-fetch-worker.js", "/workers/service/resources/");
+        var frame = await interceptedFrame("resources/service-worker-importScript-worker.js", "/workers/service/resources/");
         var fetch = frame.contentWindow.fetch;
         var response = await fetch("status");
         log("Status is " + response.statusText);

Modified: branches/safari-605-branch/LayoutTests/http/tests/workers/service/service-worker-importScript-expected.txt (226887 => 226888)


--- branches/safari-605-branch/LayoutTests/http/tests/workers/service/service-worker-importScript-expected.txt	2018-01-12 15:21:42 UTC (rev 226887)
+++ branches/safari-605-branch/LayoutTests/http/tests/workers/service/service-worker-importScript-expected.txt	2018-01-12 15:21:46 UTC (rev 226888)
@@ -1,5 +1,4 @@
-Registering service worker
-Registered service worker
-Status is no status
+
+Status is unknown url
 PASS
 

Modified: branches/safari-605-branch/LayoutTests/platform/mac-wk2/TestExpectations (226887 => 226888)


--- branches/safari-605-branch/LayoutTests/platform/mac-wk2/TestExpectations	2018-01-12 15:21:42 UTC (rev 226887)
+++ branches/safari-605-branch/LayoutTests/platform/mac-wk2/TestExpectations	2018-01-12 15:21:46 UTC (rev 226888)
@@ -859,5 +859,3 @@
 
 webkit.org/b/181069 fast/mediastream/MediaStream-MediaElement-setObject-null.html [ Pass Failure ]
 
-webkit.org/b/181097 http/tests/workers/service/service-worker-importScript.html [ Pass Failure ]
-
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to