Diff
Modified: trunk/LayoutTests/ChangeLog (271768 => 271769)
--- trunk/LayoutTests/ChangeLog 2021-01-23 01:22:39 UTC (rev 271768)
+++ trunk/LayoutTests/ChangeLog 2021-01-23 01:24:38 UTC (rev 271769)
@@ -1,5 +1,23 @@
2021-01-22 Jonathan Bedard <[email protected]>
+ [LayoutTests] Move service-worker python files to resources
+ https://bugs.webkit.org/show_bug.cgi?id=220881
+ <rdar://problem/73518780>
+
+ Reviewed by Alexey Proskuryakov.
+
+ * http/wpt/service-workers/check-service-worker-header.https.html:
+ * http/wpt/service-workers/check-service-worker-header.py: Moved.
+ * http/wpt/service-workers/file-upload-check.py: Moved.
+ * http/wpt/service-workers/file-upload.html:
+ * http/wpt/service-workers/resources/check-service-worker-header.py: Copied from LayoutTests/http/wpt/service-workers/check-service-worker-header.py.
+ * http/wpt/service-workers/resources/file-upload-check.py: Copied from LayoutTests/http/wpt/service-workers/file-upload-check.py.
+ * http/wpt/service-workers/resources/update-worker.py: Copied from LayoutTests/http/wpt/service-workers/update-worker.py.
+ * http/wpt/service-workers/update-service-worker.https.html:
+ * http/wpt/service-workers/update-worker.py: Moved.
+
+2021-01-22 Jonathan Bedard <[email protected]>
+
[LayoutTests] Move redirect.py in resources folder
https://bugs.webkit.org/show_bug.cgi?id=220876
<rdar://problem/73516627>
Modified: trunk/LayoutTests/http/wpt/service-workers/check-service-worker-header.https.html (271768 => 271769)
--- trunk/LayoutTests/http/wpt/service-workers/check-service-worker-header.https.html 2021-01-23 01:22:39 UTC (rev 271768)
+++ trunk/LayoutTests/http/wpt/service-workers/check-service-worker-header.https.html 2021-01-23 01:24:38 UTC (rev 271769)
@@ -4,6 +4,6 @@
<script src=""
<script>
promise_test(async (test) => {
- return navigator.serviceWorker.register("check-service-worker-header.py")
+ return navigator.serviceWorker.register("resources/check-service-worker-header.py")
}, "Testing loading service worker script with the correct Service-Worker header");
</script>
Deleted: trunk/LayoutTests/http/wpt/service-workers/check-service-worker-header.py (271768 => 271769)
--- trunk/LayoutTests/http/wpt/service-workers/check-service-worker-header.py 2021-01-23 01:22:39 UTC (rev 271768)
+++ trunk/LayoutTests/http/wpt/service-workers/check-service-worker-header.py 2021-01-23 01:24:38 UTC (rev 271769)
@@ -1,5 +0,0 @@
-def main(request, response):
-
- service_worker_header_value = request.headers.get("Service-Worker")
- code = 200 if service_worker_header_value == "script" else 404
- return code, [("Content-Type", "application/_javascript_")], ""
Deleted: trunk/LayoutTests/http/wpt/service-workers/file-upload-check.py (271768 => 271769)
--- trunk/LayoutTests/http/wpt/service-workers/file-upload-check.py 2021-01-23 01:22:39 UTC (rev 271768)
+++ trunk/LayoutTests/http/wpt/service-workers/file-upload-check.py 2021-01-23 01:24:38 UTC (rev 271769)
@@ -1,3 +0,0 @@
-def main(request, response):
-
- return 200, [("Content-Type", "text/html")], request.body
Modified: trunk/LayoutTests/http/wpt/service-workers/file-upload.html (271768 => 271769)
--- trunk/LayoutTests/http/wpt/service-workers/file-upload.html 2021-01-23 01:22:39 UTC (rev 271768)
+++ trunk/LayoutTests/http/wpt/service-workers/file-upload.html 2021-01-23 01:24:38 UTC (rev 271769)
@@ -95,7 +95,7 @@
}, "Setup file form data");
promise_test(async (test) => {
- const response = await frame.contentWindow.fetch("/WebKit/service-workers/file-upload-check.py?do-not-handle", {method: "POST", body: formData});
+ const response = await frame.contentWindow.fetch("/WebKit/service-workers/resources/file-upload-check.py?do-not-handle", {method: "POST", body: formData});
const text = await response.text();
assert_true(text.includes(tempFileContent), "content");
assert_true(text.includes(tempFileName), "name");
@@ -102,7 +102,7 @@
}, "Upload not handled by service worker");
promise_test(async (test) => {
- const response = await frame.contentWindow.fetch("/WebKit/service-workers/file-upload-check.py", {method: "POST", body: formData});
+ const response = await frame.contentWindow.fetch("/WebKit/service-workers/resources/file-upload-check.py", {method: "POST", body: formData});
const text = await response.text();
assert_true(text.includes(tempFileContent), "content");
assert_true(text.includes(tempFileName), "name");
Copied: trunk/LayoutTests/http/wpt/service-workers/resources/check-service-worker-header.py (from rev 271768, trunk/LayoutTests/http/wpt/service-workers/check-service-worker-header.py) (0 => 271769)
--- trunk/LayoutTests/http/wpt/service-workers/resources/check-service-worker-header.py (rev 0)
+++ trunk/LayoutTests/http/wpt/service-workers/resources/check-service-worker-header.py 2021-01-23 01:24:38 UTC (rev 271769)
@@ -0,0 +1,5 @@
+def main(request, response):
+
+ service_worker_header_value = request.headers.get("Service-Worker")
+ code = 200 if service_worker_header_value == "script" else 404
+ return code, [("Content-Type", "application/_javascript_")], ""
Copied: trunk/LayoutTests/http/wpt/service-workers/resources/file-upload-check.py (from rev 271768, trunk/LayoutTests/http/wpt/service-workers/file-upload-check.py) (0 => 271769)
--- trunk/LayoutTests/http/wpt/service-workers/resources/file-upload-check.py (rev 0)
+++ trunk/LayoutTests/http/wpt/service-workers/resources/file-upload-check.py 2021-01-23 01:24:38 UTC (rev 271769)
@@ -0,0 +1,3 @@
+def main(request, response):
+
+ return 200, [("Content-Type", "text/html")], request.body
Copied: trunk/LayoutTests/http/wpt/service-workers/resources/update-worker.py (from rev 271768, trunk/LayoutTests/http/wpt/service-workers/update-worker.py) (0 => 271769)
--- trunk/LayoutTests/http/wpt/service-workers/resources/update-worker.py (rev 0)
+++ trunk/LayoutTests/http/wpt/service-workers/resources/update-worker.py 2021-01-23 01:24:38 UTC (rev 271769)
@@ -0,0 +1,15 @@
+import time
+
+script = '''
+// Time stamp: %s
+// (This ensures the source text is *not* a byte-for-byte match with any
+// previously-fetched version of this script.)
+
+self.addEventListener("fetch", async (event) => {
+ if (event.request.url.indexOf("mouse") !== -1)
+ event.respondWith(new Response("cat"));
+});'''
+
+
+def main(request, response):
+ return [('Content-Type', 'application/_javascript_'), ('Cache-Control', 'np-cache, no-store')], script % time.time()
Modified: trunk/LayoutTests/http/wpt/service-workers/update-service-worker.https.html (271768 => 271769)
--- trunk/LayoutTests/http/wpt/service-workers/update-service-worker.https.html 2021-01-23 01:22:39 UTC (rev 271768)
+++ trunk/LayoutTests/http/wpt/service-workers/update-service-worker.https.html 2021-01-23 01:24:38 UTC (rev 271769)
@@ -13,7 +13,7 @@
registration = await navigator.serviceWorker.getRegistration("resources");
if (registration)
await registration.unregister();
- registration = await navigator.serviceWorker.register("update-worker.py", { scope : "resources" });
+ registration = await navigator.serviceWorker.register("resources/update-worker.py", { scope : "resources" });
activeWorker = registration.active;
if (activeWorker)
return;
Deleted: trunk/LayoutTests/http/wpt/service-workers/update-worker.py (271768 => 271769)
--- trunk/LayoutTests/http/wpt/service-workers/update-worker.py 2021-01-23 01:22:39 UTC (rev 271768)
+++ trunk/LayoutTests/http/wpt/service-workers/update-worker.py 2021-01-23 01:24:38 UTC (rev 271769)
@@ -1,15 +0,0 @@
-import time
-
-script = '''
-// Time stamp: %s
-// (This ensures the source text is *not* a byte-for-byte match with any
-// previously-fetched version of this script.)
-
-self.addEventListener("fetch", async (event) => {
- if (event.request.url.indexOf("mouse") !== -1)
- event.respondWith(new Response("cat"));
-});'''
-
-
-def main(request, response):
- return [('Content-Type', 'application/_javascript_'), ('Cache-Control', 'np-cache, no-store')], script % time.time()
