[webkit-changes] [275533] trunk/LayoutTests

Tue, 06 Apr 2021 11:01:30 -0700

Title: [275533] trunk/LayoutTests
Revision
275533
Author
cgambr...@apple.com
Date
2021-04-06 11:00:33 -0700 (Tue, 06 Apr 2021)

Log Message

[LayoutTests] Convert http/tests/loading convert PHP to Python
https://bugs.webkit.org/show_bug.cgi?id=222198
<rdar://problem/74536576>

Reviewed by Jonathan Bedard.

* http/tests/loading/redirect-methods-expected.txt:
* http/tests/loading/resources/redirect-methods-form.html:
* http/tests/loading/resources/redirect-methods-result.php: Removed.
* http/tests/loading/resources/redirect-methods-result.py: Added.

Modified Paths

Added Paths

Removed Paths

Diff

Modified: trunk/LayoutTests/ChangeLog (275532 => 275533)


--- trunk/LayoutTests/ChangeLog	2021-04-06 17:54:10 UTC (rev 275532)
+++ trunk/LayoutTests/ChangeLog	2021-04-06 18:00:33 UTC (rev 275533)
@@ -1,3 +1,16 @@
+2021-04-06  Chris Gambrell  <cgambr...@apple.com>
+
+        [LayoutTests] Convert http/tests/loading convert PHP to Python
+        https://bugs.webkit.org/show_bug.cgi?id=222198
+        <rdar://problem/74536576>
+
+        Reviewed by Jonathan Bedard.
+
+        * http/tests/loading/redirect-methods-expected.txt:
+        * http/tests/loading/resources/redirect-methods-form.html:
+        * http/tests/loading/resources/redirect-methods-result.php: Removed.
+        * http/tests/loading/resources/redirect-methods-result.py: Added.
+
 2021-04-06  Ryan Haddad  <ryanhad...@apple.com>
 
         [ macOS Wk2 ] media/media-fragments/TC0051.html is flakey crashing

Modified: trunk/LayoutTests/http/tests/loading/redirect-methods-expected.txt (275532 => 275533)


--- trunk/LayoutTests/http/tests/loading/redirect-methods-expected.txt	2021-04-06 17:54:10 UTC (rev 275532)
+++ trunk/LayoutTests/http/tests/loading/redirect-methods-expected.txt	2021-04-06 18:00:33 UTC (rev 275533)
@@ -16,15 +16,15 @@
 frame "0" - didCancelClientRedirectForFrame
 frame "0" - didCommitLoadForFrame
 frame "0" - didFinishDocumentLoadForFrame
-frame "0" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
+frame "0" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.py
 frame "0" - didHandleOnloadEventsForFrame
 frame "0" - didFinishLoadForFrame
 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
 frame "0" - didStartProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 301>
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.py, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.py?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.py, http status code 301>
 frame "0" - didReceiveServerRedirectForProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, http status code 200>
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.py?redirected=true, http status code 200>
 frame "0" - didCancelClientRedirectForFrame
 frame "0" - didCommitLoadForFrame
 frame "0" - didFinishDocumentLoadForFrame
@@ -36,7 +36,7 @@
 frame "1" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-form.html
 frame "0" - didHandleOnloadEventsForFrame
 frame "0" - didFinishLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - didFinishLoading
 frame "1" - didStartProvisionalLoadForFrame
 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse (null)
 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, http status code 200>
@@ -44,14 +44,14 @@
 frame "1" - didCommitLoadForFrame
 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
 frame "1" - didFinishDocumentLoadForFrame
-frame "1" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
+frame "1" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.py
 frame "1" - didHandleOnloadEventsForFrame
 frame "1" - didFinishLoadForFrame
 frame "1" - didStartProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 302>
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.py, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.py?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.py, http status code 302>
 frame "1" - didReceiveServerRedirectForProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, http status code 200>
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.py?redirected=true, http status code 200>
 frame "1" - didCancelClientRedirectForFrame
 frame "1" - didCommitLoadForFrame
 frame "1" - didFinishDocumentLoadForFrame
@@ -63,7 +63,7 @@
 frame "2" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-form.html
 frame "1" - didHandleOnloadEventsForFrame
 frame "1" - didFinishLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - didFinishLoading
 frame "2" - didStartProvisionalLoadForFrame
 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse (null)
 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, http status code 200>
@@ -71,14 +71,14 @@
 frame "2" - didCommitLoadForFrame
 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
 frame "2" - didFinishDocumentLoadForFrame
-frame "2" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
+frame "2" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.py
 frame "2" - didHandleOnloadEventsForFrame
 frame "2" - didFinishLoadForFrame
 frame "2" - didStartProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 303>
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.py, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.py?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.py, http status code 303>
 frame "2" - didReceiveServerRedirectForProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, http status code 200>
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.py?redirected=true, http status code 200>
 frame "2" - didCancelClientRedirectForFrame
 frame "2" - didCommitLoadForFrame
 frame "2" - didFinishDocumentLoadForFrame
@@ -90,7 +90,7 @@
 frame "3" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-form.html
 frame "2" - didHandleOnloadEventsForFrame
 frame "2" - didFinishLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didFinishLoading
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - didFinishLoading
 frame "3" - didStartProvisionalLoadForFrame
 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method GET> redirectResponse (null)
 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-form.html, http status code 200>
@@ -98,14 +98,14 @@
 frame "3" - didCommitLoadForFrame
 http://127.0.0.1:8000/loading/resources/redirect-methods-form.html - didFinishLoading
 frame "3" - didFinishDocumentLoadForFrame
-frame "3" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.php
+frame "3" - willPerformClientRedirectToURL: http://127.0.0.1:8000/loading/resources/redirect-methods-result.py
 frame "3" - didHandleOnloadEventsForFrame
 frame "3" - didFinishLoadForFrame
 frame "3" - didStartProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php, http status code 307>
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.py, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse (null)
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - willSendRequest <NSURLRequest URL http://127.0.0.1:8000/loading/resources/redirect-methods-result.py?redirected=true, main document URL http://127.0.0.1:8000/loading/redirect-methods.html, http method POST> redirectResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.py, http status code 307>
 frame "3" - didReceiveServerRedirectForProvisionalLoadForFrame
-http://127.0.0.1:8000/loading/resources/redirect-methods-result.php - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.php?redirected=true, http status code 200>
+http://127.0.0.1:8000/loading/resources/redirect-methods-result.py - didReceiveResponse <NSURLResponse http://127.0.0.1:8000/loading/resources/redirect-methods-result.py?redirected=true, http status code 200>
 frame "3" - didCancelClientRedirectForFrame
 frame "3" - didCommitLoadForFrame
 frame "3" - didFinishDocumentLoadForFrame

Modified: trunk/LayoutTests/http/tests/loading/resources/redirect-methods-form.html (275532 => 275533)


--- trunk/LayoutTests/http/tests/loading/resources/redirect-methods-form.html	2021-04-06 17:54:10 UTC (rev 275532)
+++ trunk/LayoutTests/http/tests/loading/resources/redirect-methods-form.html	2021-04-06 18:00:33 UTC (rev 275533)
@@ -1,6 +1,6 @@
 <html>
 <body>
-<form id="testForm" action="" method="POST">
+<form id="testForm" action="" method="POST">
 <input id="testFormInput" type="radio" name="status" checked>
 </form>
 </body>

Deleted: trunk/LayoutTests/http/tests/loading/resources/redirect-methods-result.php (275532 => 275533)


--- trunk/LayoutTests/http/tests/loading/resources/redirect-methods-result.php	2021-04-06 17:54:10 UTC (rev 275532)
+++ trunk/LayoutTests/http/tests/loading/resources/redirect-methods-result.php	2021-04-06 18:00:33 UTC (rev 275533)
@@ -1,10 +0,0 @@
-<?php
-$status = (int)$_REQUEST['status'];
-if ($status > 200 && !$_GET['redirected']) {
-  header("Location: redirect-methods-result.php?redirected=true", TRUE, $status);
-  exit();
-}
-?>
-Request Method: <?php echo $_SERVER['REQUEST_METHOD'] ?><br> 
-Request Body: <?php echo @file_get_contents('php://input') ?><br>
-Request Content-Type: <?php echo $_SERVER["CONTENT_TYPE"]; ?>

Added: trunk/LayoutTests/http/tests/loading/resources/redirect-methods-result.py (0 => 275533)


--- trunk/LayoutTests/http/tests/loading/resources/redirect-methods-result.py	                        (rev 0)
+++ trunk/LayoutTests/http/tests/loading/resources/redirect-methods-result.py	2021-04-06 18:00:33 UTC (rev 275533)
@@ -0,0 +1,48 @@
+#!/usr/bin/env python3
+
+import cgi
+import os
+import sys
+from urllib.parse import parse_qs
+
+file = __file__.split(':/cygwin')[-1]
+http_root = os.path.dirname(os.path.dirname(os.path.abspath(os.path.dirname(file))))
+sys.path.insert(0, http_root)
+
+from resources.portabilityLayer import get_cookies
+
+request_method = os.environ.get('REQUEST_METHOD', '')
+content_type = os.environ.get('CONTENT_TYPE', '')
+
+query = parse_qs(os.environ.get('QUERY_STRING', ''), keep_blank_values=True)
+redirected = query.get('redirected', [None])[0]
+
+request = {}
+if request_method == 'POST':
+    form = cgi.FieldStorage()
+    for key in form.keys():
+        request.update({ key: form.getvalue(key) })
+else:
+    query = parse_qs(os.environ.get('QUERY_STRING', ''), keep_blank_values=True)
+    for key in query.keys():
+        request.update({ key: query[key][0] })
+
+request.update(get_cookies())
+
+status = int(request.get('status', 200))
+
+data = ''.join(sys.stdin.readlines())
+
+sys.stdout.write('Content-Type: text/html\r\n')
+if status > 200 and redirected is None:
+    sys.stdout.write(
+        'status: {}\r\n'
+        'Location: redirect-methods-result.py?redirected=true\r\n\r\n'.format(status)
+    )
+    sys.exit(0)
+
+sys.stdout.write(
+    '\r\nRequest Method: {}<br> \n'
+    'Request Body: {}<br>\n'
+    'Request Content-Type: {}'.format(request_method, data, content_type)
+)
\ No newline at end of file
Property changes on: trunk/LayoutTests/http/tests/loading/resources/redirect-methods-result.py
___________________________________________________________________

Added: svn:executable

+* \ No newline at end of property 
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to