Changeset 208205 in webkit
- Timestamp:
- Oct 31, 2016 6:17:58 PM (7 years ago)
- Location:
- trunk/Tools
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Tools/ChangeLog
r208201 r208205 1 2016-10-31 Dewei Zhu <dewei_zhu@apple.com> 2 3 Update twisted version in webkitpy.thirdparty.autoinstalled module. 4 https://bugs.webkit.org/show_bug.cgi?id=154667 5 6 Reviewed by Ryosuke Niwa. 7 8 Use twisted_15_5_0 for the twisted module used by run-benchmark because there is a bug in twisted 12.1.0 which sometimes stops the test. 9 Installing twisted was introduced in https://bugs.webkit.org/show_bug.cgi?id=147082 for run-benchmark script. 10 Since buildbot relies on twisted 12.1.0 and has not been verified the compatibility on twisted 15.5.0, it would be more secure to use an individual version for run-benchmark script. 11 12 * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py: 13 * Scripts/webkitpy/thirdparty/__init__.py: 14 (AutoinstallImportHook.find_module): 15 (AutoinstallImportHook._install_twisted_15_5_0): 16 (AutoinstallImportHook._install_twisted): Deleted. 17 1 18 2016-10-31 Ryosuke Niwa <rniwa@webkit.org> 2 19 -
trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py
r202362 r208205 5 5 import os 6 6 import sys 7 from pkg_resources import require, VersionConflict, DistributionNotFound 7 8 8 9 try: 10 require("Twisted>=15.5.0") 9 11 import twisted 10 except ImportError:12 except (ImportError, VersionConflict, DistributionNotFound): 11 13 sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../..'))) 12 from webkitpy.thirdparty.autoinstalled.twisted import twisted14 from webkitpy.thirdparty.autoinstalled.twisted_15_5_0 import twisted 13 15 14 16 from twisted.web import static, server -
trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py
r202362 r208205 38 38 import psutil 39 39 for attempt in xrange(max_attempt): 40 try: 41 self._server_port = psutil.Process(self._server_process.pid).connections()[0][3][1] 42 if self._server_port: 43 _log.info('HTTP Server is serving at port: %d', self._server_port) 44 break 45 except IndexError: 46 pass 40 connections = psutil.Process(self._server_process.pid).connections() 41 if connections and connections[0].laddr and connections[0].laddr[1] and connections[0].status == 'LISTEN': 42 self._server_port = connections[0].laddr[1] 43 _log.info('HTTP Server is serving at port: %d', self._server_port) 44 break 47 45 _log.info('Server port is not found this time, retry after %f seconds' % interval) 48 46 time.sleep(interval) 49 47 interval *= 2 50 48 else: 51 raise Exception(" Cannot listen to server, max tries exceeded")49 raise Exception("Server is not listening on port, max tries exceeded. HTTP server may be installing dependent modules.") 52 50 except ImportError: 53 51 for attempt in xrange(max_attempt): -
trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py
r206420 r208205 92 92 elif '.keyring' in fullname: 93 93 self._install_keyring() 94 elif '.twisted ' in fullname:95 self._install_twisted ()94 elif '.twisted_15_5_0' in fullname: 95 self._install_twisted_15_5_0() 96 96 97 97 def _install_mechanize(self): … … 151 151 self._install(url="http://www.adambarth.com/webkit/eliza", target_name="eliza.py") 152 152 153 def _install_twisted (self):154 twisted_dir = self._fs.join(_AUTOINSTALLED_DIR, "twisted ")153 def _install_twisted_15_5_0(self): 154 twisted_dir = self._fs.join(_AUTOINSTALLED_DIR, "twisted_15_5_0") 155 155 installer = AutoInstaller(prepend_to_search_path=True, target_dir=twisted_dir) 156 installer.install(url="https://pypi.python.org/packages/source/T/Twisted/Twisted-1 2.1.0.tar.bz2#md5=f396f1d6f5321e869c2f89b2196a9eb5", url_subpath="Twisted-12.1.0/twisted")156 installer.install(url="https://pypi.python.org/packages/source/T/Twisted/Twisted-15.5.0.tar.bz2#md5=0831d7c90d0020062de0f7287530a285", url_subpath="Twisted-15.5.0/twisted") 157 157 installer.install(url="https://pypi.python.org/packages/source/z/zope.interface/zope.interface-4.1.3.tar.gz#md5=9ae3d24c0c7415deb249dd1a132f0f79", url_subpath="zope.interface-4.1.3/src/zope") 158 158
Note: See TracChangeset
for help on using the changeset viewer.