diff options
| author | Servo WPT Sync <32481905+servo-wpt-sync@users.noreply.github.com> | 2023-10-25 03:26:53 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-25 07:26:53 +0000 |
| commit | 65beca94cd748e4974f3aed9c21c3a233551760c (patch) | |
| tree | 213c3e54dd9c7c117ff604f1ab79e13cb0fa0477 /python/wpt/manifestupdate.py | |
| parent | 1f961b9d384dafb744f65a2e5da41312b003e64c (diff) | |
| download | servo-65beca94cd748e4974f3aed9c21c3a233551760c.tar.gz servo-65beca94cd748e4974f3aed9c21c3a233551760c.zip | |
Sync WPT with upstream (24-10-2023) (#30607)
* wpt sync: adapt code for new TestRoot class
Fixes #30558
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
* temp change to allow wpt sync build to pass
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
* Update web-platform-tests to revision b'0d5028f200c8651b17bb224657d6e1065adcff37'
* Revert "temp change to allow wpt sync build to pass"
This reverts commit bad72c7f87c0df16085763ee15ebe63a53462ab3.
* revert metadata update for intermittent timeouts
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
---------
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
Co-authored-by: Mukilan Thiyagarajan <mukilan@igalia.com>
Diffstat (limited to 'python/wpt/manifestupdate.py')
| -rw-r--r-- | python/wpt/manifestupdate.py | 8 |
1 files changed, 4 insertions, 4 deletions
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, |