diff options
Diffstat (limited to 'python')
| -rw-r--r-- | python/wpt/manifestupdate.py | 20 | ||||
| -rw-r--r-- | python/wpt/update.py | 8 |
2 files changed, 23 insertions, 5 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, diff --git a/python/wpt/update.py b/python/wpt/update.py index 138bcfb2233..11c055c0240 100644 --- a/python/wpt/update.py +++ b/python/wpt/update.py @@ -109,7 +109,13 @@ def update_tests(**kwargs) -> int: wptcommandline.set_from_config(kwargs) if hasattr(wptcommandline, 'check_paths'): - wptcommandline.check_paths(kwargs["test_paths"]) + # FIXME(mukilan): temporary hack since check_paths + # is used before and after we sync the wptrunner code + # with upstream and upstream has changed the argument + try: + wptcommandline.check_paths(kwargs) + except AttributeError: + wptcommandline.check_paths(kwargs["test_paths"]) if kwargs.pop("legacy_layout"): update_args_for_legacy_layout(kwargs) |