From 3a46bf651a0e7473b834aeaa598219e3317cde72 Mon Sep 17 00:00:00 2001 From: Josh Matthews Date: Wed, 20 Mar 2019 10:12:25 -0400 Subject: [PATCH] Cherry-pick https://github.com/web-platform-tests/wpt/pull/15949 from upstream. --- .../web-platform-tests/tools/manifest/manifest.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/tests/wpt/web-platform-tests/tools/manifest/manifest.py b/tests/wpt/web-platform-tests/tools/manifest/manifest.py index e2e35d7ff99..90655daca22 100644 --- a/tests/wpt/web-platform-tests/tools/manifest/manifest.py +++ b/tests/wpt/web-platform-tests/tools/manifest/manifest.py @@ -421,11 +421,11 @@ def load(tests_root, manifest, types=None, meta_filters=None): __load_cache = {} -def _load(logger, tests_root, manifest, types=None, meta_filters=None): +def _load(logger, tests_root, manifest, types=None, meta_filters=None, allow_cached=True): # "manifest" is a path or file-like object. manifest_path = (manifest if isinstance(manifest, string_types) else manifest.name) - if manifest_path in __load_cache: + if allow_cached and manifest_path in __load_cache: return __load_cache[manifest_path] if isinstance(manifest, string_types): @@ -450,7 +450,8 @@ def _load(logger, tests_root, manifest, types=None, meta_filters=None): types=types, meta_filters=meta_filters) - __load_cache[manifest_path] = rv + if allow_cached: + __load_cache[manifest_path] = rv return rv @@ -464,7 +465,8 @@ def load_and_update(tests_root, working_copy=False, types=None, meta_filters=None, - write_manifest=True): + write_manifest=True, + allow_cached=True): logger = get_logger() manifest = None @@ -474,7 +476,8 @@ def load_and_update(tests_root, tests_root, manifest_path, types=types, - meta_filters=meta_filters) + meta_filters=meta_filters, + allow_cached=allow_cached) except ManifestVersionMismatch: logger.info("Manifest version changed, rebuilding")