Mirrors/servo
1
0
Fork 0
mirror of https://github.com/servo/servo.git synced 2025-08-05 13:40:08 +01:00
Code Issues Projects Releases Packages Wiki Activity

Auto merge of #27230 - servo:jdm-patch-46, r=jgraham

Browse source 
Add missing test path for manifest during WPT syncing.

Fixes #27223.
This commit is contained in:
bors-servo 2020-07-10 16:08:30 -04:00 • committed by GitHub
commit 56a4cfdfa4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
tests/wpt/metadata/MANIFEST.json
View file

@ -355728,7 +355728,7 @@
[]
],
"sync.py": [
"0a41f706ebc3760729d9ba553076fe0d7e0b40b8",
"c3da2098d3c55dd5a79fa662a112335a03fcaa33",
[]
],
"tree.py": [

19
tests/wpt/web-platform-tests/tools/wptrunner/wptrunner/update/sync.py
View file

@ -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("/")
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]