Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-07-23 07:13:52 +01:00
Code Issues Projects Releases Packages Wiki Activity

wpt sync: adapt code for new TestRoot class

Browse source 
Fixes #30558

Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
This commit is contained in:
Mukilan Thiyagarajan 2023-10-23 18:01:23 +05:30
parent fdcbe613ac
commit 1fa206945b
3 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

6
python/wpt/__init__.py
View file

@ -49,13 +49,13 @@ def create_parser():
def update_args_for_legacy_layout(kwargs: dict): def update_args_for_legacy_layout(kwargs: dict):
kwargs["test_paths"]["/"]["metadata_path"] = os.path.join( kwargs["test_paths"]["/"].metadata_path = os.path.join(
WPT_PATH, "meta-legacy-layout" WPT_PATH, "meta-legacy-layout"
) )
kwargs["test_paths"]["/_mozilla/"]["metadata_path"] = os.path.join( kwargs["test_paths"]["/_mozilla/"].metadata_path = os.path.join(
WPT_PATH, "mozilla", "meta-legacy-layout" WPT_PATH, "mozilla", "meta-legacy-layout"
) )
kwargs["test_paths"]["/_webgl/"]["metadata_path"] = os.path.join( kwargs["test_paths"]["/_webgl/"].metadata_path = os.path.join(
WPT_PATH, "webgl", "meta-legacy-layout" WPT_PATH, "webgl", "meta-legacy-layout"
) )

8
python/wpt/manifestupdate.py
View file

@ -51,10 +51,10 @@ def update(check_clean=True, rebuild=False, **kwargs):
def _update(logger, test_paths, rebuild): def _update(logger, test_paths, rebuild):
for url_base, paths in iteritems(test_paths): for url_base, paths in iteritems(test_paths):
manifest_path = os.path.join(paths["metadata_path"], "MANIFEST.json") manifest_path = os.path.join(paths.metadata_path, "MANIFEST.json")
cache_subdir = os.path.relpath(os.path.dirname(manifest_path), cache_subdir = os.path.relpath(os.path.dirname(manifest_path),
os.path.dirname(__file__)) os.path.dirname(__file__))
wptmanifest.manifest.load_and_update(paths["tests_path"], wptmanifest.manifest.load_and_update(paths.tests_path,
manifest_path, manifest_path,
url_base, url_base,
working_copy=True, working_copy=True,
@ -68,8 +68,8 @@ def _check_clean(logger, test_paths):
manifests_by_path = {} manifests_by_path = {}
rv = 0 rv = 0
for url_base, paths in iteritems(test_paths): for url_base, paths in iteritems(test_paths):
tests_path = paths["tests_path"] tests_path = paths.tests_path
manifest_path = os.path.join(paths["metadata_path"], "MANIFEST.json") manifest_path = os.path.join(paths.metadata_path, "MANIFEST.json")
old_manifest = wptmanifest.manifest.load_and_update(tests_path, old_manifest = wptmanifest.manifest.load_and_update(tests_path,
manifest_path, manifest_path,

2
python/wpt/update.py
View file

@ -109,7 +109,7 @@ def update_tests(**kwargs) -> int:
wptcommandline.set_from_config(kwargs) wptcommandline.set_from_config(kwargs)
if hasattr(wptcommandline, 'check_paths'): if hasattr(wptcommandline, 'check_paths'):
wptcommandline.check_paths(kwargs) wptcommandline.check_paths(kwargs["test_paths"])
if kwargs.pop("legacy_layout"): if kwargs.pop("legacy_layout"):
update_args_for_legacy_layout(kwargs) update_args_for_legacy_layout(kwargs)