Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-15 10:25:32 +01:00
Code Issues Projects Releases Packages Wiki Activity

Update web-platform-tests to revision 3bbb55915a04548e70c63b7c143a83e0e9d3c5e7

Browse source
This commit is contained in:
WPT Sync Bot 2019-04-01 22:33:23 -04:00
parent 3340214a29
commit b55cc798b6
100 changed files with 2036 additions and 3665 deletions
Download patch file Download diff file Expand all files Collapse all files

23
tests/wpt/web-platform-tests/tools/manifest/item.py
View file

@ -63,16 +63,12 @@ class URLManifestItem(ManifestItem):
def __init__(self, tests_root, path, url_base, url, **extras):
super(URLManifestItem, self).__init__(tests_root, path)
assert url_base[0] == "/"
self.url_base = url_base
assert url[0] != "/"
self._url = url
self._extras = extras
@property
def _source_file(self):
"""create a SourceFile for the item"""
from .sourcefile import SourceFile
return SourceFile(self._tests_root, self.path, self.url_base)
@property
def id(self):
return self.url
@ -80,11 +76,6 @@ class URLManifestItem(ManifestItem):
@property
def url(self):
# we can outperform urljoin, because we know we just have path relative URLs
if self._url[0] == "/":
# TODO: MANIFEST6
# this is actually a bug in older generated manifests, _url shouldn't
# be an absolute path
return self._url
if self.url_base == "/":
return "/" + self._url
return urljoin(self.url_base, self._url)
@ -125,12 +116,7 @@ class TestharnessTest(URLManifestItem):
@property
def script_metadata(self):
if "script_metadata" in self._extras:
return self._extras["script_metadata"]
else:
# TODO: MANIFEST6
# this branch should go when the manifest version is bumped
return self._source_file.script_metadata
return self._extras.get("script_metadata")
def to_json(self):
rv = super(TestharnessTest, self).to_json()
@ -140,8 +126,7 @@ class TestharnessTest(URLManifestItem):
rv[-1]["testdriver"] = self.testdriver
if self.jsshell:
rv[-1]["jsshell"] = True
if self.script_metadata is not None:
# we store this even if it is [] to avoid having to read the source file
if self.script_metadata:
rv[-1]["script_metadata"] = self.script_metadata
return rv