diff options
| author | Mukilan Thiyagarajan <mukilan@igalia.com> | 2023-10-23 18:01:23 +0530 |
|---|---|---|
| committer | Mukilan Thiyagarajan <mukilan@igalia.com> | 2023-10-23 22:14:18 +0530 |
| commit | 1fa206945b96edcaa263e767a5da695eda88bafc (patch) | |
| tree | 3044a3bf8473b203a6944d6bad8b79115bb30f8b | |
| parent | fdcbe613ac152aeac8ae82830b027f90abc1c780 (diff) | |
| download | servo-1fa206945b96edcaa263e767a5da695eda88bafc.tar.gz servo-1fa206945b96edcaa263e767a5da695eda88bafc.zip | |
wpt sync: adapt code for new TestRoot class
Fixes #30558
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
| -rw-r--r-- | python/wpt/__init__.py | 6 | ||||
| -rw-r--r-- | python/wpt/manifestupdate.py | 8 | ||||
| -rw-r--r-- | python/wpt/update.py | 2 |
3 files changed, 8 insertions, 8 deletions
diff --git a/python/wpt/__init__.py b/python/wpt/__init__.py index 0dd5406e319..8c9e37df750 100644 --- a/python/wpt/__init__.py +++ b/python/wpt/__init__.py @@ -49,13 +49,13 @@ def create_parser(): 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" ) - kwargs["test_paths"]["/_mozilla/"]["metadata_path"] = os.path.join( + kwargs["test_paths"]["/_mozilla/"].metadata_path = os.path.join( 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" ) diff --git a/python/wpt/manifestupdate.py b/python/wpt/manifestupdate.py index 09b414c0c40..c1428aa2cca 100644 --- a/python/wpt/manifestupdate.py +++ b/python/wpt/manifestupdate.py @@ -51,10 +51,10 @@ def update(check_clean=True, rebuild=False, **kwargs): def _update(logger, test_paths, rebuild): 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), os.path.dirname(__file__)) - wptmanifest.manifest.load_and_update(paths["tests_path"], + wptmanifest.manifest.load_and_update(paths.tests_path, manifest_path, url_base, working_copy=True, @@ -68,8 +68,8 @@ def _check_clean(logger, test_paths): manifests_by_path = {} rv = 0 for url_base, paths in iteritems(test_paths): - tests_path = paths["tests_path"] - manifest_path = os.path.join(paths["metadata_path"], "MANIFEST.json") + tests_path = paths.tests_path + manifest_path = os.path.join(paths.metadata_path, "MANIFEST.json") old_manifest = wptmanifest.manifest.load_and_update(tests_path, manifest_path, diff --git a/python/wpt/update.py b/python/wpt/update.py index 87dfd4dfd2c..138bcfb2233 100644 --- a/python/wpt/update.py +++ b/python/wpt/update.py @@ -109,7 +109,7 @@ def update_tests(**kwargs) -> int: wptcommandline.set_from_config(kwargs) if hasattr(wptcommandline, 'check_paths'): - wptcommandline.check_paths(kwargs) + wptcommandline.check_paths(kwargs["test_paths"]) if kwargs.pop("legacy_layout"): update_args_for_legacy_layout(kwargs) |