147082 2015-07-18 22:46:27 -0700 Install twisted package for http server when necessary. 2015-08-04 17:46:59 -0700 1 1 1 Unclassified WebKit New Bugs 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 1 dewei_zhu webkit-unassigned commit-queue glenn rniwa oldest_to_newest 1110455 0 dewei_zhu 2015-07-18 22:46:27 -0700 Install twisted package for http server when necessary. 1110459 1 257054 dewei_zhu 2015-07-18 23:13:08 -0700 Created attachment 257054 Patch 1110464 2 257054 rniwa 2015-07-19 00:13:44 -0700 Comment on attachment 257054 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257054&action=review > Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:12 > + from webkitpy.common.system.autoinstall import AutoInstaller Why don't we modify __init__.py in autoinstalled instead? What happens if we've already installed twisted in that directory by using buildbot? 1110517 3 257054 dewei_zhu 2015-07-19 14:31:51 -0700 Comment on attachment 257054 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257054&action=review >> Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:12 >> + from webkitpy.common.system.autoinstall import AutoInstaller > > Why don't we modify __init__.py in autoinstalled instead? > What happens if we've already installed twisted in that directory by using buildbot? If we've installed twisted, we'll not catch ImportError. If we modify __init__.py, how do we invoke the installation process? Do you mean we import autoinstall module in benchmark runner and it will check the installation of twisted and install it if necessary? 1110519 4 257054 rniwa 2015-07-19 14:46:15 -0700 Comment on attachment 257054 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=257054&action=review >>> Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:12 >>> + from webkitpy.common.system.autoinstall import AutoInstaller >> >> Why don't we modify __init__.py in autoinstalled instead? >> What happens if we've already installed twisted in that directory by using buildbot? > > If we've installed twisted, we'll not catch ImportError. > If we modify __init__.py, how do we invoke the installation process? > Do you mean we import autoinstall module in benchmark runner and it will check the installation of twisted and install it if necessary? But that's what we tried other day (importing autoinstall.buildbot) on my machine and we saw import didn't work. > Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:16 > + installer = AutoInstaller(prepend_to_search_path=True, target_dir=install_path) > + installer.install(url="https://pypi.python.org/packages/source/T/Twisted/Twisted-12.1.0.tar.bz2#md5=f396f1d6f5321e869c2f89b2196a9eb5", url_subpath="Twisted-12.1.0/twisted") There is already code that does this in __init__.py in webkitpy/thirdparty for when we import thirdparty.autoinstall.twisted. Why don't we make that code more generic to do this instead? It appears to me that having to download & install twisted every time you run benchmark is somewhat inefficient/redundant. I already hate the fact some of the benchmark plans require downloading the benchmark and we should add some code to cache the downloaded content. 1114855 5 258229 dewei_zhu 2015-08-04 16:26:15 -0700 Created attachment 258229 Patch 1114900 6 258229 commit-queue 2015-08-04 17:46:56 -0700 Comment on attachment 258229 Patch Clearing flags on attachment: 258229 Committed r187925: <http://trac.webkit.org/changeset/187925> 1114901 7 commit-queue 2015-08-04 17:46:59 -0700 All reviewed patches have been landed. Closing bug. 257054 2015-07-18 23:13:08 -0700 2015-08-04 16:26:12 -0700 Patch bug-147082-20150718231200.patch text/plain 1921 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3MDA4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggOWIyMzE4NGJkN2QzYWZhNWJjOGZiMTVmOTdhNWNmOWJi NTI2MmY3OC4uZGJlN2I0OGFhNWM3ODU4MjA0YjRhMDQxN2ViZWY1NTc3YjNmNzNlYSAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDEy IEBACisyMDE1LTA3LTE4ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIEluc3RhbGwgdHdpc3RlZCBwYWNrYWdlIGZvciBodHRwIHNlcnZlciB3aGVuIG5lY2Vzc2Fy eS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzA4 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3Nl cnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5OgorCiAyMDE1LTA3LTE4ICBTaW1vbiBGcmFzZXIg IDxzaW1vbi5mcmFzZXJAYXBwbGUuY29tPgogCiAgICAgICAgIE1pbmlCcm93c2VyIHdpbmRvdyB0 aXRsZSBpcyBqdXN0ICJXaW5kb3ciIHdoZW4gcGFnZSBoYXMgbm8gPHRpdGxlPgpkaWZmIC0tZ2l0 IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2Ry aXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5IGIvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3NlcnZlci90 d2lzdGVkX2h0dHBfc2VydmVyLnB5CmluZGV4IGI2MzQyMDk0NzE0MDNjZjRlYTJlNmZiNzMzYTQ5 OTI5NzA2ODE1ZjguLjdkNWM1NmIwNmU0NDU4OWU0YWEwNjI3ZWIxZDRjYTQyNWU2Y2M0NGMgMTAw NjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5lci9odHRwX3Nl cnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXIvdHdpc3RlZF9odHRwX3NlcnZlci5weQorKysgYi9Ub29s cy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJfZHJpdmVyL2h0 dHBfc2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2ZXIucHkKQEAgLTQsNiArNCwxNyBAQCBpbXBvcnQg YXJncGFyc2UKIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgc3lzCiAKK3RyeToKKyAgICBpbXBvcnQg dHdpc3RlZAorZXhjZXB0IEltcG9ydEVycm9yOgorICAgIGltcG9ydCBvcworICAgIHN5cy5wYXRo LmFwcGVuZChvcy5wYXRoLmFic3BhdGgob3MucGF0aC5qb2luKG9zLnBhdGguZGlybmFtZShvcy5w YXRoLmFic3BhdGgoX19maWxlX18pKSwgJy4uLy4uLy4uLy4uJykpKQorICAgIGZyb20gd2Via2l0 cHkuY29tbW9uLnN5c3RlbS5hdXRvaW5zdGFsbCBpbXBvcnQgQXV0b0luc3RhbGxlcgorICAgIGlt cG9ydCB0ZW1wZmlsZQorICAgIGluc3RhbGxfcGF0aCA9IHRlbXBmaWxlLm1rZHRlbXAoKQorICAg IGluc3RhbGxlciA9IEF1dG9JbnN0YWxsZXIocHJlcGVuZF90b19zZWFyY2hfcGF0aD1UcnVlLCB0 YXJnZXRfZGlyPWluc3RhbGxfcGF0aCkKKyAgICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9Imh0dHBz Oi8vcHlwaS5weXRob24ub3JnL3BhY2thZ2VzL3NvdXJjZS9UL1R3aXN0ZWQvVHdpc3RlZC0xMi4x LjAudGFyLmJ6MiNtZDU9ZjM5NmYxZDZmNTMyMWU4NjljMmY4OWIyMTk2YTllYjUiLCB1cmxfc3Vi cGF0aD0iVHdpc3RlZC0xMi4xLjAvdHdpc3RlZCIpCisKIGZyb20gdHdpc3RlZC53ZWIgaW1wb3J0 IHN0YXRpYywgc2VydmVyCiBmcm9tIHR3aXN0ZWQud2ViLnJlc291cmNlIGltcG9ydCBSZXNvdXJj ZQogZnJvbSB0d2lzdGVkLmludGVybmV0IGltcG9ydCByZWFjdG9yCg== 258229 2015-08-04 16:26:15 -0700 2015-08-04 17:46:56 -0700 Patch bug-147082-20150804162608.patch text/plain 3982 dewei_zhu U3VidmVyc2lvbiBSZXZpc2lvbjogMTg3OTA4CmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZjFmYmE3NmFlNDM1NmEzZjFjOTk2NGFlNGE4ZWFkMGY1 ODdjOTM5Yy4uMzZkYTI4OWIyYTQ3MzY2NDZkMzQ1MDg0OTM2MGJlYWNlODhhMTMwMiAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE1 IEBACisyMDE1LTA4LTA0ICBEZXdlaSBaaHUgIDxkZXdlaV96aHVAYXBwbGUuY29tPgorCisgICAg ICAgIEluc3RhbGwgdHdpc3RlZCBwYWNrYWdlIGZvciBodHRwIHNlcnZlciB3aGVuIG5lY2Vzc2Fy eS4KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE0NzA4 MgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2Ny aXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRwX3Nl cnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5OgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkv dGhpcmRwYXJ0eS9fX2luaXRfXy5weToKKyAgICAgICAgKEF1dG9pbnN0YWxsSW1wb3J0SG9vay5m aW5kX21vZHVsZSk6CisgICAgICAgIChBdXRvaW5zdGFsbEltcG9ydEhvb2suX2luc3RhbGxfdHdp c3RlZCk6CisKIDIwMTUtMDgtMDQgIEJyZW50IEZ1bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+ CiAKICAgICAgICAgW1dpbl0gVXBkYXRlIEFwcGxlIFdpbmRvd3MgYnVpbGQgZm9yIFZTMjAxNQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBf c2VydmVyX2RyaXZlci9odHRwX3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5IGIvVG9vbHMv U2NyaXB0cy93ZWJraXRweS9iZW5jaG1hcmtfcnVubmVyL2h0dHBfc2VydmVyX2RyaXZlci9odHRw X3NlcnZlci90d2lzdGVkX2h0dHBfc2VydmVyLnB5CmluZGV4IGI2MzQyMDk0NzE0MDNjZjRlYTJl NmZiNzMzYTQ5OTI5NzA2ODE1ZjguLmFlNDNlY2E4M2E1OWY5YTQ0ZTI5OWFlZjg4MjRhNWUyYzk0 MzAyYzMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvd2Via2l0cHkvYmVuY2htYXJrX3J1bm5l ci9odHRwX3NlcnZlcl9kcml2ZXIvaHR0cF9zZXJ2ZXIvdHdpc3RlZF9odHRwX3NlcnZlci5weQor KysgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L2JlbmNobWFya19ydW5uZXIvaHR0cF9zZXJ2ZXJf ZHJpdmVyL2h0dHBfc2VydmVyL3R3aXN0ZWRfaHR0cF9zZXJ2ZXIucHkKQEAgLTIsOCArMiwxNSBA QAogCiBpbXBvcnQgYXJncGFyc2UKIGltcG9ydCBsb2dnaW5nCitpbXBvcnQgb3MKIGltcG9ydCBz eXMKIAordHJ5OgorICAgIGltcG9ydCB0d2lzdGVkCitleGNlcHQgSW1wb3J0RXJyb3I6CisgICAg c3lzLnBhdGguYXBwZW5kKG9zLnBhdGguYWJzcGF0aChvcy5wYXRoLmpvaW4ob3MucGF0aC5kaXJu YW1lKG9zLnBhdGguYWJzcGF0aChfX2ZpbGVfXykpLCAnLi4vLi4vLi4vLi4nKSkpCisgICAgZnJv bSB3ZWJraXRweS50aGlyZHBhcnR5LmF1dG9pbnN0YWxsZWQudHdpc3RlZCBpbXBvcnQgdHdpc3Rl ZAorCiBmcm9tIHR3aXN0ZWQud2ViIGltcG9ydCBzdGF0aWMsIHNlcnZlcgogZnJvbSB0d2lzdGVk LndlYi5yZXNvdXJjZSBpbXBvcnQgUmVzb3VyY2UKIGZyb20gdHdpc3RlZC5pbnRlcm5ldCBpbXBv cnQgcmVhY3RvcgpAQCAtMjcsMTIgKzM0LDEyIEBAIGNsYXNzIFNlcnZlckNvbnRyb2woUmVzb3Vy Y2UpOgogCiAKIGlmIF9fbmFtZV9fID09ICdfX21haW5fXyc6Ci0gICAgcGFyc2VyID0gYXJncGFy c2UuQXJndW1lbnRQYXJzZXIoZGVzY3JpcHRpb249J3B5dGhvbiBUd2lzdGVkSFRUUFNlcnZlci5w eSB3ZWJSb290JykKLSAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCd3ZWJSb290JykKKyAgICBwYXJz ZXIgPSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcihkZXNjcmlwdGlvbj0ncHl0aG9uIHR3aXN0ZWRf aHR0cF9zZXJ2ZXIucHkgd2ViX3Jvb3QnKQorICAgIHBhcnNlci5hZGRfYXJndW1lbnQoJ3dlYl9y b290JykKICAgICBhcmdzID0gcGFyc2VyLnBhcnNlX2FyZ3MoKQotICAgIHdlYlJvb3QgPSBzdGF0 aWMuRmlsZShhcmdzLndlYlJvb3QpCisgICAgd2ViX3Jvb3QgPSBzdGF0aWMuRmlsZShhcmdzLndl Yl9yb290KQogICAgIHNlcnZlckNvbnRyb2wgPSBTZXJ2ZXJDb250cm9sKCkKLSAgICB3ZWJSb290 LnB1dENoaWxkKCdzaHV0ZG93bicsIHNlcnZlckNvbnRyb2wpCi0gICAgd2ViUm9vdC5wdXRDaGls ZCgncmVwb3J0Jywgc2VydmVyQ29udHJvbCkKLSAgICByZWFjdG9yLmxpc3RlblRDUCgwLCBzZXJ2 ZXIuU2l0ZSh3ZWJSb290KSkKKyAgICB3ZWJfcm9vdC5wdXRDaGlsZCgnc2h1dGRvd24nLCBzZXJ2 ZXJDb250cm9sKQorICAgIHdlYl9yb290LnB1dENoaWxkKCdyZXBvcnQnLCBzZXJ2ZXJDb250cm9s KQorICAgIHJlYWN0b3IubGlzdGVuVENQKDAsIHNlcnZlci5TaXRlKHdlYl9yb290KSkKICAgICBy ZWFjdG9yLnJ1bigpCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFy dHkvX19pbml0X18ucHkgYi9Ub29scy9TY3JpcHRzL3dlYmtpdHB5L3RoaXJkcGFydHkvX19pbml0 X18ucHkKaW5kZXggYzNiYWY3MTFhMWVlMzNiNWE3MjViNDQwYjI2MGIyNzZiZTIyNTNmZS4uZjQz YzNhY2FkODlkMWMxODFhZmI0NWMzOTE2ZjJjZjkxYjZmYjg1OSAxMDA2NDQKLS0tIGEvVG9vbHMv U2NyaXB0cy93ZWJraXRweS90aGlyZHBhcnR5L19faW5pdF9fLnB5CisrKyBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvdGhpcmRwYXJ0eS9fX2luaXRfXy5weQpAQCAtOTEsNiArOTEsOCBAQCBjbGFz cyBBdXRvaW5zdGFsbEltcG9ydEhvb2sob2JqZWN0KToKICAgICAgICAgICAgIHNlbGYuX2luc3Rh bGxfYnVpbGRib3QoKQogICAgICAgICBlbGlmICcua2V5cmluZycgaW4gZnVsbG5hbWU6CiAgICAg ICAgICAgICBzZWxmLl9pbnN0YWxsX2tleXJpbmcoKQorICAgICAgICBlbGlmICcudHdpc3RlZCcg aW4gZnVsbG5hbWU6CisgICAgICAgICAgICBzZWxmLl9pbnN0YWxsX3R3aXN0ZWQoKQogCiAgICAg ZGVmIF9pbnN0YWxsX21lY2hhbml6ZShzZWxmKToKICAgICAgICAgc2VsZi5faW5zdGFsbCgiaHR0 cDovL3B5cGkucHl0aG9uLm9yZy9wYWNrYWdlcy9zb3VyY2UvbS9tZWNoYW5pemUvbWVjaGFuaXpl LTAuMi41LnRhci5neiIsCkBAIC0xNDgsNiArMTUwLDExIEBAIGNsYXNzIEF1dG9pbnN0YWxsSW1w b3J0SG9vayhvYmplY3QpOgogICAgIGRlZiBfaW5zdGFsbF9lbGl6YShzZWxmKToKICAgICAgICAg c2VsZi5faW5zdGFsbCh1cmw9Imh0dHA6Ly93d3cuYWRhbWJhcnRoLmNvbS93ZWJraXQvZWxpemEi LCB0YXJnZXRfbmFtZT0iZWxpemEucHkiKQogCisgICAgZGVmIF9pbnN0YWxsX3R3aXN0ZWQoc2Vs Zik6CisgICAgICAgIHR3aXN0ZWRfZGlyID0gc2VsZi5fZnMuam9pbihfQVVUT0lOU1RBTExFRF9E SVIsICJ0d2lzdGVkIikKKyAgICAgICAgaW5zdGFsbGVyID0gQXV0b0luc3RhbGxlcihwcmVwZW5k X3RvX3NlYXJjaF9wYXRoPVRydWUsIHRhcmdldF9kaXI9dHdpc3RlZF9kaXIpCisgICAgICAgIGlu c3RhbGxlci5pbnN0YWxsKHVybD0iaHR0cHM6Ly9weXBpLnB5dGhvbi5vcmcvcGFja2FnZXMvc291 cmNlL1QvVHdpc3RlZC9Ud2lzdGVkLTEyLjEuMC50YXIuYnoyI21kNT1mMzk2ZjFkNmY1MzIxZTg2 OWMyZjg5YjIxOTZhOWViNSIsIHVybF9zdWJwYXRoPSJUd2lzdGVkLTEyLjEuMC90d2lzdGVkIikK KwogICAgIGRlZiBfaW5zdGFsbChzZWxmLCB1cmwsIHVybF9zdWJwYXRoPU5vbmUsIHRhcmdldF9u YW1lPU5vbmUpOgogICAgICAgICBpbnN0YWxsZXIgPSBBdXRvSW5zdGFsbGVyKHRhcmdldF9kaXI9 X0FVVE9JTlNUQUxMRURfRElSKQogICAgICAgICBpbnN0YWxsZXIuaW5zdGFsbCh1cmw9dXJsLCB1 cmxfc3VicGF0aD11cmxfc3VicGF0aCwgdGFyZ2V0X25hbWU9dGFyZ2V0X25hbWUpCg==