Title: [198187] trunk/Tools
- Revision
- 198187
- Author
- [email protected]
- Date
- 2016-03-14 18:52:02 -0700 (Mon, 14 Mar 2016)
Log Message
Add twisted-15.5.0 module to webkitpy.thirdparty.autoinstalled.
https://bugs.webkit.org/show_bug.cgi?id=154667
Reviewed by Ryosuke Niwa and Simon Fraser.
Add twisted-15.5.0 to webkitpy.thirdparty.autoinstalled.
Minor fix for twsited_http_server used by run-benchmark that we should only stop http server while recieving 'GET /shutdown'.
* Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:
(ServerControl.render_POST): Deleted.
* Scripts/webkitpy/thirdparty/__init__.py:
(AutoinstallImportHook.find_module):
(AutoinstallImportHook._install_twisted_15_5_0):
* Scripts/webkitpy/thirdparty/__init___unittest.py:
(ThirdpartyTest.test_imports):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (198186 => 198187)
--- trunk/Tools/ChangeLog 2016-03-15 01:40:48 UTC (rev 198186)
+++ trunk/Tools/ChangeLog 2016-03-15 01:52:02 UTC (rev 198187)
@@ -1,3 +1,21 @@
+2016-03-14 Dewei Zhu <[email protected]>
+
+ Add twisted-15.5.0 module to webkitpy.thirdparty.autoinstalled.
+ https://bugs.webkit.org/show_bug.cgi?id=154667
+
+ Reviewed by Ryosuke Niwa and Simon Fraser.
+
+ Add twisted-15.5.0 to webkitpy.thirdparty.autoinstalled.
+ Minor fix for twsited_http_server used by run-benchmark that we should only stop http server while recieving 'GET /shutdown'.
+
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py:
+ (ServerControl.render_POST): Deleted.
+ * Scripts/webkitpy/thirdparty/__init__.py:
+ (AutoinstallImportHook.find_module):
+ (AutoinstallImportHook._install_twisted_15_5_0):
+ * Scripts/webkitpy/thirdparty/__init___unittest.py:
+ (ThirdpartyTest.test_imports):
+
2016-03-14 Mark Lam <[email protected]>
Need to distinguish between Symbol() and Symbol("").
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py (198186 => 198187)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2016-03-15 01:40:48 UTC (rev 198186)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/http_server/twisted_http_server.py 2016-03-15 01:52:02 UTC (rev 198187)
@@ -9,7 +9,7 @@
import twisted
except ImportError:
sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../..')))
- from webkitpy.thirdparty.autoinstalled.twisted import twisted
+ from webkitpy.thirdparty.autoinstalled.twisted_15_5_0 import twisted
from twisted.web import static, server
from twisted.web.resource import Resource
@@ -29,7 +29,6 @@
_log.info("Serving request %s" % request)
sys.stdout.write(request.content.getvalue())
sys.stdout.flush()
- reactor.stop()
return 'OK'
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py (198186 => 198187)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2016-03-15 01:40:48 UTC (rev 198186)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init__.py 2016-03-15 01:52:02 UTC (rev 198187)
@@ -91,6 +91,8 @@
self._install_buildbot()
elif '.keyring' in fullname:
self._install_keyring()
+ elif '.twisted_15_5_0' in fullname:
+ self._install_twisted_15_5_0()
elif '.twisted' in fullname:
self._install_twisted()
@@ -155,6 +157,11 @@
installer = AutoInstaller(prepend_to_search_path=True, target_dir=twisted_dir)
installer.install(url="" url_subpath="Twisted-12.1.0/twisted")
+ def _install_twisted_15_5_0(self):
+ twisted_dir = self._fs.join(_AUTOINSTALLED_DIR, "twisted_15_5_0")
+ installer = AutoInstaller(prepend_to_search_path=True, target_dir=twisted_dir)
+ installer.install(url="" url_subpath="Twisted-15.5.0/twisted")
+
def _install(self, url, url_subpath=None, target_name=None):
installer = AutoInstaller(target_dir=_AUTOINSTALLED_DIR)
installer.install(url="" url_subpath=url_subpath, target_name=target_name)
Modified: trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py (198186 => 198187)
--- trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py 2016-03-15 01:40:48 UTC (rev 198186)
+++ trunk/Tools/Scripts/webkitpy/thirdparty/__init___unittest.py 2016-03-15 01:52:02 UTC (rev 198187)
@@ -64,3 +64,5 @@
import webkitpy.thirdparty.autoinstalled.mechanize
import webkitpy.thirdparty.autoinstalled.pylint
import webkitpy.thirdparty.autoinstalled.pep8
+ import webkitpy.thirdparty.autoinstalled.twisted
+ import webkitpy.thirdparty.autoinstalled.twisted_15_5_0
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
