diff --git a/tests/wpt/metadata/MANIFEST.json b/tests/wpt/metadata/MANIFEST.json index eefb5e32cbb..03cd7fea305 100644 --- a/tests/wpt/metadata/MANIFEST.json +++ b/tests/wpt/metadata/MANIFEST.json @@ -355728,7 +355728,7 @@ [] ], "sync.py": [ - "0a41f706ebc3760729d9ba553076fe0d7e0b40b8", + "c3da2098d3c55dd5a79fa662a112335a03fcaa33", [] ], "tree.py": [ diff --git a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py index 592ddc4311b..c3da2098d3c 100644 --- a/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py +++ b/tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py @@ -92,24 +92,18 @@ class GetSyncTargetCommit(Step): self.logger.debug("New base commit is %s" % state.sync_commit.sha1) -class LoadManifest(Step): - """Load the test manifest""" +class UpdateManifest(Step): + """Update the manifest to match the tests in the sync tree checkout""" provides = ["manifest_path", "test_manifest"] def create(self, state): from manifest import manifest state.manifest_path = os.path.join(state.metadata_path, "MANIFEST.json") - state.test_manifest = manifest.Manifest(state.sync["path"], "/") - - -class UpdateManifest(Step): - """Update the manifest to match the tests in the sync tree checkout""" - - def create(self, state): - from manifest import manifest, update - update.update(state.sync["path"], state.test_manifest) - manifest.write(state.test_manifest, state.manifest_path) + state.test_manifest = manifest.load_and_update(state.sync["path"], + state.manifest_path, + "/", + write_manifest=True) class CopyWorkTree(Step): @@ -149,7 +143,6 @@ class SyncFromUpstreamRunner(StepRunner): """(Sub)Runner for doing an upstream sync""" steps = [UpdateCheckout, GetSyncTargetCommit, - LoadManifest, UpdateManifest, CopyWorkTree, CreateSyncPatch]