MANIFEST.json regeneration is broken on ToT |
||||||
Issue description
Regenerating the manifest results in this error:
% Tools/Scripts/webkitpy/thirdparty/wpt/wpt/manifest --work --tests-root=LayoutTests/external/wpt
DEBUG:manifest:Opening manifest at /usr/local/google/home/jeffcarp/chromium/src/third_party/WebKit/LayoutTests/external/wpt/MANIFEST.json
INFO:manifest:Updating manifest
Traceback (most recent call last):
File "Tools/Scripts/webkitpy/thirdparty/wpt/wpt/manifest", line 8, in <module>
os.path.abspath(os.path.dirname(__file__)))
File "/usr/local/google/home/jeffcarp/chromium/src/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/manifest/update.py", line 104, in main
update_from_cli(**vars(opts))
File "/usr/local/google/home/jeffcarp/chromium/src/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/manifest/update.py", line 46, in update_from_cli
working_copy=kwargs["work"])
File "/usr/local/google/home/jeffcarp/chromium/src/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/manifest/update.py", line 21, in update
return manifest.update(tree)
File "/usr/local/google/home/jeffcarp/chromium/src/third_party/WebKit/Tools/Scripts/webkitpy/thirdparty/wpt/wpt/tools/manifest/manifest.py", line 81, in update
old_files[old_type].remove(rel_path)
KeyError: './MANIFEST.json'
The cause of this is MANIFEST.json showing up as an entry in MANIFEST.json. If you remove that entry, the regeneration script runs without error.
As a short term solution, deleting MANIFEST.json and regenerating from scratch works.
,
Feb 28 2017
,
Feb 28 2017
,
Mar 3 2017
The following revision refers to this bug: https://chromium.googlesource.com/chromium/src.git/+/eb1ff6b20500834aa8283148b8a7b78f2938ca27 commit eb1ff6b20500834aa8283148b8a7b78f2938ca27 Author: Jeff Carpenter <jeffcarp@chromium.org> Date: Fri Mar 03 00:48:43 2017 Add MANIFEST.json to .gitignore, regenerate it from template in test runner This solves 2 problems: 1. Regenerating MANIFEST.json is failing on ToT ( bug 697207 ) - Now that MANIFEST.json is in .gitignore, regeneration works 2. Regenerating adds MANIFEST.json to MANIFEST.json ( bug 683485 ) - MANIFEST.json no longer shows up in MANIFEST.json BUG= 697207 , 666957 , 683485 Change-Id: I09987b66027e1f94055888c8ead58e7e40896d62 Reviewed-on: https://chromium-review.googlesource.com/447959 Commit-Queue: Jeff Carpenter <jeffcarp@chromium.org> Reviewed-by: Quinten Yearsley <qyearsley@chromium.org> Cr-Commit-Position: refs/heads/master@{#454454} [modify] https://crrev.com/eb1ff6b20500834aa8283148b8a7b78f2938ca27/docs/testing/web_platform_tests.md [rename] https://crrev.com/eb1ff6b20500834aa8283148b8a7b78f2938ca27/third_party/WebKit/LayoutTests/external/WPT_BASE_MANIFEST.json [add] https://crrev.com/eb1ff6b20500834aa8283148b8a7b78f2938ca27/third_party/WebKit/LayoutTests/external/wpt/.gitignore [modify] https://crrev.com/eb1ff6b20500834aa8283148b8a7b78f2938ca27/third_party/WebKit/Tools/Scripts/webkitpy/common/host_mock.py [modify] https://crrev.com/eb1ff6b20500834aa8283148b8a7b78f2938ca27/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager.py [modify] https://crrev.com/eb1ff6b20500834aa8283148b8a7b78f2938ca27/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/controllers/manager_unittest.py [modify] https://crrev.com/eb1ff6b20500834aa8283148b8a7b78f2938ca27/third_party/WebKit/Tools/Scripts/webkitpy/layout_tests/run_webkit_tests_unittest.py [modify] https://crrev.com/eb1ff6b20500834aa8283148b8a7b78f2938ca27/third_party/WebKit/Tools/Scripts/webkitpy/w3c/test_importer_unittest.py [modify] https://crrev.com/eb1ff6b20500834aa8283148b8a7b78f2938ca27/third_party/WebKit/Tools/Scripts/webkitpy/w3c/wpt_manifest.py
,
Mar 3 2017
The manifest update script should be working now. It ignores MANIFEST.json since it has been added to LayoutTests/external/wpt/.gitignore.
,
Jul 3 2017
,
Jul 3 2017
|
||||||
►
Sign in to add a comment |
||||||
Comment 1 by jeffcarp@chromium.org
, Feb 28 2017