aboutsummaryrefslogtreecommitdiffstats
path: root/python/wpt/manifestupdate.py
diff options
context:
space:
mode:
authorMukilan Thiyagarajan <mukilan@igalia.com>2023-10-23 22:13:18 +0530
committerMukilan Thiyagarajan <mukilan@igalia.com>2023-10-24 12:20:03 +0530
commitbad72c7f87c0df16085763ee15ebe63a53462ab3 (patch)
tree775e4756713170869ddb5f0629c3444de79ea386 /python/wpt/manifestupdate.py
parent1fa206945b96edcaa263e767a5da695eda88bafc (diff)
downloadservo-fix-wpt-sync-testroot-issue.tar.gz
servo-fix-wpt-sync-testroot-issue.zip
temp change to allow wpt sync build to passfix-wpt-sync-testroot-issue
Signed-off-by: Mukilan Thiyagarajan <mukilan@igalia.com>
Diffstat (limited to 'python/wpt/manifestupdate.py')
-rw-r--r--python/wpt/manifestupdate.py20
1 files changed, 16 insertions, 4 deletions
diff --git a/python/wpt/manifestupdate.py b/python/wpt/manifestupdate.py
index c1428aa2cca..164beb5fc2a 100644
--- a/python/wpt/manifestupdate.py
+++ b/python/wpt/manifestupdate.py
@@ -50,11 +50,16 @@ def update(check_clean=True, rebuild=False, **kwargs):
def _update(logger, test_paths, rebuild):
+ def get_path(obj, path):
+ if isinstance(obj, dict):
+ return obj[path]
+ else:
+ return getattr(obj, path)
for url_base, paths in iteritems(test_paths):
- manifest_path = os.path.join(paths.metadata_path, "MANIFEST.json")
+ manifest_path = os.path.join(get_path(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(get_path(paths, 'tests_path'),
manifest_path,
url_base,
working_copy=True,
@@ -68,8 +73,15 @@ 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")
+ def get_path(obj, path):
+ if isinstance(obj, dict):
+ return obj[path]
+ else:
+ return getattr(obj, path)
+
+ tests_path = get_path(paths, "tests_path")
+ manifest_path = os.path.join(
+ get_path(paths, "metadata_path"), "MANIFEST.json")
old_manifest = wptmanifest.manifest.load_and_update(tests_path,
manifest_path,