169190 2017-03-05 20:00:58 -0800 import-w3c-tests doesn't work with svn repositories 2017-03-08 20:23:56 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 sam sam ap commit-queue glenn lforschler youennf oldest_to_newest 1283680 0 sam 2017-03-05 20:00:58 -0800 Now, I could be totally doing something wrong, but on trying to import the subresource-integrity directory for the web-platform-tests, I could not get get the import-w3c-tests script to work. I did the following: > import-w3c-tests web-platform-tests/subresource-integrity And got: Downloading W3C test repositories Traceback (most recent call last): File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/import-w3c-tests", line 35, in <module> sys.exit(test_importer.main(sys.argv[1:], sys.stdout, sys.stderr)) File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/w3c/test_importer.py", line 99, in main test_importer.do_import() File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/w3c/test_importer.py", line 197, in do_import self.test_downloader().download_tests(self.source_directory, self.test_paths) File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/w3c/test_downloader.py", line 218, in download_tests self.checkout_test_repository(test_repository['revision'], test_repository['url'], self._filesystem.join(self.repository_directory, test_repository['name'])) File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/w3c/test_downloader.py", line 81, in checkout_test_repository git = self.git('.') File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/w3c/test_downloader.py", line 78, in git return Git(test_repository, None, executive=self._host.executive, filesystem=self._filesystem) File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 62, in __init__ SCM.__init__(self, cwd, **kwargs) File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 66, in __init__ self.checkout_root = self.find_checkout_root(self.cwd) File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 120, in find_checkout_root checkout_root = self._run_git(['rev-parse', '--show-toplevel'], cwd=(path or "./")).strip() File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/git.py", line 107, in _run_git return self.run(full_command_args, **full_kwargs) File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/common/checkout/scm/scm.py", line 77, in run decode_output=decode_output) File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/common/system/executive.py", line 459, in run_command (error_handler or self.default_error_handler)(script_error) File "/Volumes/Data/Code/WebKitSVN/OpenSource/Tools/Scripts/webkitpy/common/system/executive.py", line 377, in default_error_handler raise error webkitpy.common.system.executive.ScriptError: Failed to run "['git', 'rev-parse', '--show-toplevel']" exit_code: 128 cwd: . I'm not super familiar with the script, but it does seem to be trying to do something with git, which makes sense since the tests are located on github, but the code is actually trying to see if the current directory is a git directory, which I don't understand. 1283682 1 303496 sam 2017-03-05 20:47:24 -0800 Created attachment 303496 Potential patch Attaching a potential patch. This adds a class method to the Git class that allows cloning a repository without an existing git repository. The design of the Git class seems odd, at least for this use case, in that you have to initialize with an path to an existing git repository. 1283693 2 youennf 2017-03-05 22:27:33 -0800 Your changes make sense to me, one should not need a git repo to clone another repo. Also, the downloader code should not use private methods (_run_git at least) of Git instances. 1284911 3 303822 sam 2017-03-08 11:11:08 -0800 Created attachment 303822 Patch 1285205 4 303822 commit-queue 2017-03-08 20:23:51 -0800 Comment on attachment 303822 Patch Clearing flags on attachment: 303822 Committed r213625: <http://trac.webkit.org/changeset/213625> 1285206 5 commit-queue 2017-03-08 20:23:56 -0800 All reviewed patches have been landed. Closing bug. 303496 2017-03-05 20:47:24 -0800 2017-03-08 11:11:02 -0800 Potential patch couldBe.diff text/plain 2187 sam SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL2NoZWNrb3V0L3NjbS9naXQucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2Nt L2dpdC5weQkocmV2aXNpb24gMjEzNDM5KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vY2hlY2tvdXQvc2NtL2dpdC5weQkod29ya2luZyBjb3B5KQpAQCAtMTE1LDYgKzExNSwxNCBA QCBjbGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKICAgICAgICAgICAgICMgVGhlIFdpbmRv d3MgYm90cyBzZWVtIHRvIHRocm91Z2ggYSBXaW5kb3dzRXJyb3Igd2hlbiBnaXQgaXNuJ3QgaW5z dGFsbGVkLgogICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAKKyAgICBAY2xhc3NtZXRob2QKKyAg ICBkZWYgY2xvbmUoY2xzLCB1cmwsIGRpcmVjdG9yeSwgZXhlY3V0aXZlPU5vbmUpOgorICAgICAg ICB0cnk6CisgICAgICAgICAgICBleGVjdXRpdmUgPSBleGVjdXRpdmUgb3IgRXhlY3V0aXZlKCkK KyAgICAgICAgICAgIHJldHVybiBleGVjdXRpdmUucnVuX2NvbW1hbmQoW2Nscy5leGVjdXRhYmxl X25hbWUsICdjbG9uZScsICctdicsIHVybCwgZGlyZWN0b3J5XSwgZXJyb3JfaGFuZGxlcj1FeGVj dXRpdmUuaWdub3JlX2Vycm9yKQorICAgICAgICBleGNlcHQgT1NFcnJvciwgZToKKyAgICAgICAg ICAgIHJldHVybiBGYWxzZQorCiAgICAgZGVmIGZpbmRfY2hlY2tvdXRfcm9vdChzZWxmLCBwYXRo KToKICAgICAgICAgIyAiZ2l0IHJldi1wYXJzZSAtLXNob3ctY2R1cCIgd291bGQgYmUgYW5vdGhl ciB3YXkgdG8gZ2V0IHRvIHRoZSByb290CiAgICAgICAgIGNoZWNrb3V0X3Jvb3QgPSBzZWxmLl9y dW5fZ2l0KFsncmV2LXBhcnNlJywgJy0tc2hvdy10b3BsZXZlbCddLCBjd2Q9KHBhdGggb3IgIi4v IikpLnN0cmlwKCkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvdzNjL3Rlc3RfZG93bmxv YWRlci5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2Rv d25sb2FkZXIucHkJKHJldmlzaW9uIDIxMzQzOSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkv dzNjL3Rlc3RfZG93bmxvYWRlci5weQkod29ya2luZyBjb3B5KQpAQCAtNzgsMTMgKzc4LDE3IEBA IGNsYXNzIFRlc3REb3dubG9hZGVyKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBHaXQodGVzdF9y ZXBvc2l0b3J5LCBOb25lLCBleGVjdXRpdmU9c2VsZi5faG9zdC5leGVjdXRpdmUsIGZpbGVzeXN0 ZW09c2VsZi5fZmlsZXN5c3RlbSkKIAogICAgIGRlZiBjaGVja291dF90ZXN0X3JlcG9zaXRvcnko c2VsZiwgcmV2aXNpb24sIHVybCwgZGlyZWN0b3J5KToKLSAgICAgICAgZ2l0ID0gc2VsZi5naXQo Jy4nKQorICAgICAgICBnaXQgPSBOb25lCiAgICAgICAgIGlmIG5vdCBzZWxmLl9maWxlc3lzdGVt LmV4aXN0cyhkaXJlY3RvcnkpOgogICAgICAgICAgICAgX2xvZy5pbmZvKCdDbG9uaW5nICVzIGlu dG8gJXMuLi4nICUgKHVybCwgZGlyZWN0b3J5KSkKLSAgICAgICAgICAgIGdpdC5fcnVuX2dpdChb J2Nsb25lJywgJy12JywgdXJsLCBkaXJlY3RvcnldKQorICAgICAgICAgICAgR2l0LmNsb25lKHVy bCwgZGlyZWN0b3J5LCBzZWxmLl9ob3N0LmV4ZWN1dGl2ZSkKKyAgICAgICAgICAgIGdpdCA9IHNl bGYuZ2l0KGRpcmVjdG9yeSkKICAgICAgICAgZWxpZiBzZWxmLl9vcHRpb25zLmZldGNoIGlzIFRy dWU6CisgICAgICAgICAgICBnaXQgPSBzZWxmLmdpdChkaXJlY3RvcnkpCiAgICAgICAgICAgICBf bG9nLmluZm8oJ0ZldGNoaW5nICVzLi4uJyAlIHVybCkKICAgICAgICAgICAgIGdpdC5fcnVuX2dp dChbJy1DJywgZGlyZWN0b3J5LCAnZmV0Y2gnXSkKKyAgICAgICAgZWxzZToKKyAgICAgICAgICAg IGdpdCA9IHNlbGYuZ2l0KGRpcmVjdG9yeSkKICAgICAgICAgX2xvZy5pbmZvKCdDaGVja2luZyBv dXQgcmV2aXNpb24gJyArIHJldmlzaW9uKQogICAgICAgICBjaGVja291dF9hcmd1bWVudHMgPSBb Jy1DJywgZGlyZWN0b3J5LCAnY2hlY2tvdXQnLCByZXZpc2lvbl0KICAgICAgICAgaWYgbm90IHNl bGYuX29wdGlvbnMudmVyYm9zZToK 303822 2017-03-08 11:11:08 -0800 2017-03-08 20:23:51 -0800 Patch bug-169190-20170308111107.patch text/plain 4204 sam SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDIxMzU4NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDE3LTAzLTA4ICBTYW0gV2VpbmlnICA8c2FtQHdlYmtpdC5vcmc+CisKKyAg ICAgICAgaW1wb3J0LXczYy10ZXN0cyBkb2Vzbid0IHdvcmsgd2l0aCBzdm4gcmVwb3NpdG9yaWVz LgorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTY5MTkw CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgVGhlIHNj cmlwdCBhc3N1bWVkIHlvdSBoYWQgV2ViS2l0IGNoZWNrZWQtb3V0IGFzIGEgZ2l0IHJlcG9zaXRv cnksIGJ1dAorICAgICAgICB0aGVyZSB3YXMgbm8gcmVhc29uIGZvciB0aGF0LgorCisgICAgICAg ICogU2NyaXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weToKKyAgICAgICAg KEdpdC5jbG9uZSk6CisgICAgICAgIEFkZCBhIGNsYXNzIG1ldGhvZCB0byBjbG9uZSBhIHJlcG9z aXRvcnkgd2hpY2ggZG9lcyBub3QgcmVxdWlyZSAKKyAgICAgICAgYW4gZXhpc3RpbmcgY2hlY2tv dXQuCisKKyAgICAgICAgKEdpdC5mZXRjaCk6CisgICAgICAgIChHaXQuY2hlY2tvdXQpOgorICAg ICAgICBBZGQgbWV0aG9kcyBuZWVkZWQgZm9yIHRlc3RfZG93bmxvYWRlci5weSwgc28gaXQgZG9l c24ndCBoYXZlIHRvIHVzZQorICAgICAgICB0aGUgaW50ZXJuYWwgX3J1bl9naXQgCisKKyAgICAg ICAgKiBTY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2Rvd25sb2FkZXIucHk6CisgICAgICAgIChU ZXN0RG93bmxvYWRlci5jaGVja291dF90ZXN0X3JlcG9zaXRvcnkpOgorICAgICAgICBTd2l0Y2gg dG8gdXNpbmcgR2l0LmNsb25lKCksIHdoaWNoIGRvZXNuJ3QgcmVxdWlyZSBhbiBleGlzdGluZyBn aXQKKyAgICAgICAgZGlyZWN0b3J5LCBhbmQgdGhlbiBhbHNvIGFkb3B0IG5vbiBwcml2YXRlIG1l dGhvZHMgdG8gZmV0Y2gvY2hlY2tvdXQuCisKIDIwMTctMDMtMDggIE1hdHQgUmFqY2EgIDxtcmFq Y2FAYXBwbGUuY29tPgogCiAgICAgICAgIEFkZCBzdXBwb3J0IGZvciB1cGRhdGluZyBhdXRvcGxh eSBwb2xpY2llcyBhZnRlciBhIHBhZ2UgaGFzIGJlZW4gbG9hZGVkLgpJbmRleDogVG9vbHMvU2Ny aXB0cy93ZWJraXRweS9jb21tb24vY2hlY2tvdXQvc2NtL2dpdC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20vZ2l0LnB5CShyZXZpc2lv biAyMTM1ODcpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9jaGVja291dC9zY20v Z2l0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xMTUsNiArMTE1LDE0IEBAIGNsYXNzIEdpdChTQ00s IFNWTlJlcG9zaXRvcnkpOgogICAgICAgICAgICAgIyBUaGUgV2luZG93cyBib3RzIHNlZW0gdG8g dGhyb3VnaCBhIFdpbmRvd3NFcnJvciB3aGVuIGdpdCBpc24ndCBpbnN0YWxsZWQuCiAgICAgICAg ICAgICByZXR1cm4gRmFsc2UKIAorICAgIEBjbGFzc21ldGhvZAorICAgIGRlZiBjbG9uZShjbHMs IHVybCwgZGlyZWN0b3J5LCBleGVjdXRpdmU9Tm9uZSk6CisgICAgICAgIHRyeToKKyAgICAgICAg ICAgIGV4ZWN1dGl2ZSA9IGV4ZWN1dGl2ZSBvciBFeGVjdXRpdmUoKQorICAgICAgICAgICAgcmV0 dXJuIGV4ZWN1dGl2ZS5ydW5fY29tbWFuZChbY2xzLmV4ZWN1dGFibGVfbmFtZSwgJ2Nsb25lJywg Jy12JywgdXJsLCBkaXJlY3RvcnldLCBlcnJvcl9oYW5kbGVyPUV4ZWN1dGl2ZS5pZ25vcmVfZXJy b3IpCisgICAgICAgIGV4Y2VwdCBPU0Vycm9yLCBlOgorICAgICAgICAgICAgcmV0dXJuIEZhbHNl CisKICAgICBkZWYgZmluZF9jaGVja291dF9yb290KHNlbGYsIHBhdGgpOgogICAgICAgICAjICJn aXQgcmV2LXBhcnNlIC0tc2hvdy1jZHVwIiB3b3VsZCBiZSBhbm90aGVyIHdheSB0byBnZXQgdG8g dGhlIHJvb3QKICAgICAgICAgY2hlY2tvdXRfcm9vdCA9IHNlbGYuX3J1bl9naXQoWydyZXYtcGFy c2UnLCAnLS1zaG93LXRvcGxldmVsJ10sIGN3ZD0ocGF0aCBvciAiLi8iKSkuc3RyaXAoKQpAQCAt NTcyLDMgKzU4MCwxMiBAQCBjbGFzcyBHaXQoU0NNLCBTVk5SZXBvc2l0b3J5KToKIAogICAgIGRl ZiBmaWxlc19jaGFuZ2VkX3N1bW1hcnlfZm9yX2NvbW1pdChzZWxmLCBjb21taXRfaWQpOgogICAg ICAgICByZXR1cm4gc2VsZi5fcnVuX2dpdChbJ2RpZmYtdHJlZScsICctLXNob3J0c3RhdCcsICct LW5vLXJlbmFtZXMnLCAnLS1uby1jb21taXQtaWQnLCBjb21taXRfaWRdKQorCisgICAgZGVmIGZl dGNoKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5fcnVuX2dpdChbJ2ZldGNoJ10pCisKKyAg ICBkZWYgY2hlY2tvdXQoc2VsZiwgcmV2aXNpb24sIHF1aWV0PU5vbmUpOgorICAgICAgICBjb21t YW5kID0gWydjaGVja291dCcsIHJldmlzaW9uXQorICAgICAgICBpZiBxdWlldDoKKyAgICAgICAg ICAgIGNvbW1hbmQgKz0gWyctcSddCisgICAgICAgIHJldHVybiBzZWxmLl9ydW5fZ2l0KGNvbW1h bmQpCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0X2Rvd25sb2FkZXIucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS93M2MvdGVzdF9kb3dubG9hZGVy LnB5CShyZXZpc2lvbiAyMTM1ODcpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3czYy90ZXN0 X2Rvd25sb2FkZXIucHkJKHdvcmtpbmcgY29weSkKQEAgLTgwLDE4ICs4MCwxOSBAQCBjbGFzcyBU ZXN0RG93bmxvYWRlcihvYmplY3QpOgogICAgICAgICByZXR1cm4gR2l0KHRlc3RfcmVwb3NpdG9y eSwgTm9uZSwgZXhlY3V0aXZlPXNlbGYuX2hvc3QuZXhlY3V0aXZlLCBmaWxlc3lzdGVtPXNlbGYu X2ZpbGVzeXN0ZW0pCiAKICAgICBkZWYgY2hlY2tvdXRfdGVzdF9yZXBvc2l0b3J5KHNlbGYsIHJl dmlzaW9uLCB1cmwsIGRpcmVjdG9yeSk6Ci0gICAgICAgIGdpdCA9IHNlbGYuZ2l0KCcuJykKKyAg ICAgICAgZ2l0ID0gTm9uZQogICAgICAgICBpZiBub3Qgc2VsZi5fZmlsZXN5c3RlbS5leGlzdHMo ZGlyZWN0b3J5KToKICAgICAgICAgICAgIF9sb2cuaW5mbygnQ2xvbmluZyAlcyBpbnRvICVzLi4u JyAlICh1cmwsIGRpcmVjdG9yeSkpCi0gICAgICAgICAgICBnaXQuX3J1bl9naXQoWydjbG9uZScs ICctdicsIHVybCwgZGlyZWN0b3J5XSkKKyAgICAgICAgICAgIEdpdC5jbG9uZSh1cmwsIGRpcmVj dG9yeSwgc2VsZi5faG9zdC5leGVjdXRpdmUpCisgICAgICAgICAgICBnaXQgPSBzZWxmLmdpdChk aXJlY3RvcnkpCiAgICAgICAgIGVsaWYgc2VsZi5fb3B0aW9ucy5mZXRjaCBpcyBUcnVlOgorICAg ICAgICAgICAgZ2l0ID0gc2VsZi5naXQoZGlyZWN0b3J5KQogICAgICAgICAgICAgX2xvZy5pbmZv KCdGZXRjaGluZyAlcy4uLicgJSB1cmwpCi0gICAgICAgICAgICBnaXQuX3J1bl9naXQoWyctQycs IGRpcmVjdG9yeSwgJ2ZldGNoJ10pCisgICAgICAgICAgICBnaXQuZmV0Y2goKQorICAgICAgICBl bHNlOgorICAgICAgICAgICAgZ2l0ID0gc2VsZi5naXQoZGlyZWN0b3J5KQogICAgICAgICBfbG9n LmluZm8oJ0NoZWNraW5nIG91dCByZXZpc2lvbiAnICsgcmV2aXNpb24pCi0gICAgICAgIGNoZWNr b3V0X2FyZ3VtZW50cyA9IFsnLUMnLCBkaXJlY3RvcnksICdjaGVja291dCcsIHJldmlzaW9uXQot ICAgICAgICBpZiBub3Qgc2VsZi5fb3B0aW9ucy52ZXJib3NlOgotICAgICAgICAgICAgY2hlY2tv dXRfYXJndW1lbnRzICs9IFsnLXEnXQotICAgICAgICBnaXQuX3J1bl9naXQoY2hlY2tvdXRfYXJn dW1lbnRzKQorICAgICAgICBnaXQuY2hlY2tvdXQocmV2aXNpb24sIG5vdCBzZWxmLl9vcHRpb25z LnZlcmJvc2UpCiAKICAgICBkZWYgX2luaXRfcGF0aHNfZnJvbV9leHBlY3RhdGlvbnMoc2VsZik6 CiAgICAgICAgIGltcG9ydF9saW5lcyA9IGpzb24ubG9hZHMoc2VsZi5fZmlsZXN5c3RlbS5yZWFk X3RleHRfZmlsZShzZWxmLmltcG9ydF9leHBlY3RhdGlvbnNfcGF0aCkpCg==