Bug 205417 – Resync web-platform-tests/beacon tests from upstream

• Status: RESOLVED
• Resolution: FIXED
• Component: Tools / Tests

[Chris Dumez]

Resync web-platform-tests/beacon tests from upstream.

[Chris Dumez]

Created attachment 386010 [details]
Patch

[Ryosuke Niwa]

The failure of imported/w3c/web-platform-tests/beacon/beacon-cors.sub.window.html on iOS & macOS WK2 seems real.

[youenn fablet]

Comment on attachment 386010 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=386010&action=review

> LayoutTests/imported/w3c/web-platform-tests/beacon/beacon-cors.sub.window-expected.txt:21
> +Blocked access to external URL http://www.localhost:8800/beacon/resources/beacon.py?cmd=store&sid=5edb8afd-19c1-44c8-861c-546f9537bcca&tid=SmallCORSContentTypeText-PREFLIGHT-ALLOW&tidx=0&origin=http://localhost:8800&credentials=true&preflightExpected=true

We should skip this test for now since it is using www.localhost.
We should then modify the test to replace domains[www] by {hosts[alt][]} so as to use 127.0.0.1 in our CI instead of www.localhost.

[Chris Dumez]

(In reply to youenn fablet from comment #3)
> Comment on attachment 386010 [details]
> Patch
> 
> View in context:
> https://bugs.webkit.org/attachment.cgi?id=386010&action=review
> 
> > LayoutTests/imported/w3c/web-platform-tests/beacon/beacon-cors.sub.window-expected.txt:21
> > +Blocked access to external URL http://www.localhost:8800/beacon/resources/beacon.py?cmd=store&sid=5edb8afd-19c1-44c8-861c-546f9537bcca&tid=SmallCORSContentTypeText-PREFLIGHT-ALLOW&tidx=0&origin=http://localhost:8800&credentials=true&preflightExpected=true
> 
> We should skip this test for now since it is using www.localhost.
> We should then modify the test to replace domains[www] by {hosts[alt][]} so
> as to use 127.0.0.1 in our CI instead of www.localhost.

It seems the Blink import script takes care of this for them:
imported/w3c/web-platform-tests/service-workers/tools/blink-import.py

It would be good if our import script could do the same.

[Chris Dumez]

Created attachment 386108 [details]
Patch

[Chris Dumez]

Comment on attachment 386108 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=386108&action=review

> Tools/Scripts/webkitpy/w3c/test_converter.py:53
> +    contents = contents.replace('{{domains[www]}}', '{{hosts[alt][]}}')

I updated our import script to replace {{domains[www]}} with {{hosts[alt][]}} automatically.

[youenn fablet]

Comment on attachment 386108 [details]
Patch

View in context: https://bugs.webkit.org/attachment.cgi?id=386108&action=review

>> Tools/Scripts/webkitpy/w3c/test_converter.py:53
>> +    contents = contents.replace('{{domains[www]}}', '{{hosts[alt][]}}')
> 
> I updated our import script to replace {{domains[www]}} with {{hosts[alt][]}} automatically.

We should probably add a unit test for this in Tools/Scripts/webkitpy/w3c/test_converter_unittest.py.
Some tests will still not be converted properly as they might be using things like 'www' + location.host, but this seems convenient and will fix many tests I believe.

I think we should still work on fixing these tests upstream instead of relying on this conversion.
Note also that this conversion is wrong in a few cases since some tests actually require www.localhost instead of 127.0.0.1.
We probably do not care since we do not have the infra to run these tests in WebKit CI.

> Tools/Scripts/webkitpy/w3c/test_importer.py:449
> +        folders_needing_file_rewriting = ['web-platform-tests/', ]

Could remove the ', '

[Chris Dumez]

Committed r253760: <https://trac.webkit.org/changeset/253760>

[Radar WebKit Bug Importer]

<rdar://problem/58082541>