Title: [225376] trunk/Tools
- Revision
- 225376
- Author
- dewei_...@apple.com
- Date
- 2017-11-30 17:52:37 -0800 (Thu, 30 Nov 2017)
Log Message
HTTP server driver is responsible for ensuring the dependencies of HTTP server.
https://bugs.webkit.org/show_bug.cgi?id=180231
Reviewed by Stephanie Lewis.
Added the logic to ensure system environment meet the requirments of launching the http server.
* Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
(SimpleHTTPServerDriver.serve):
(SimpleHTTPServerDriver.set_device_id):
(SimpleHTTPServerDriver):
(SimpleHTTPServerDriver._ensure_http_server_dependencies):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (225375 => 225376)
--- trunk/Tools/ChangeLog 2017-12-01 01:02:47 UTC (rev 225375)
+++ trunk/Tools/ChangeLog 2017-12-01 01:52:37 UTC (rev 225376)
@@ -1,3 +1,18 @@
+2017-11-30 Dewei Zhu <dewei_...@apple.com>
+
+ HTTP server driver is responsible for ensuring the dependencies of HTTP server.
+ https://bugs.webkit.org/show_bug.cgi?id=180231
+
+ Reviewed by Stephanie Lewis.
+
+ Added the logic to ensure system environment meet the requirments of launching the http server.
+
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
+ (SimpleHTTPServerDriver.serve):
+ (SimpleHTTPServerDriver.set_device_id):
+ (SimpleHTTPServerDriver):
+ (SimpleHTTPServerDriver._ensure_http_server_dependencies):
+
2017-11-30 Basuke Suzuki <basuke.suz...@sony.com>
[WinCairo] Cannot build without Internet connection
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py (225375 => 225376)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2017-12-01 01:02:47 UTC (rev 225375)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2017-12-01 01:52:37 UTC (rev 225376)
@@ -25,6 +25,7 @@
self._server_process = None
self._server_port = 0
self._ip = '127.0.0.1'
+ self._ensure_http_server_dependencies()
def serve(self, web_root):
_log.info('Launching an http server')
@@ -93,3 +94,14 @@
def set_device_id(self, device_id):
pass
+
+ def _ensure_http_server_dependencies(self):
+ _log.info('Ensure dependencies of http server is satisfied')
+ from pkg_resources import require, VersionConflict, DistributionNotFound
+ try:
+ require("Twisted>=15.5.0")
+ import twisted
+ except (ImportError, VersionConflict, DistributionNotFound):
+ _log.info("Will install twisted in webkitpy, and twisted will be used by webkitpy only")
+ sys.path.append(os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), '../../../..')))
+ from webkitpy.thirdparty.autoinstalled.twisted_15_5_0 import twisted
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
