Title: [278670] trunk/Tools
- Revision
- 278670
- Author
- [email protected]
- Date
- 2021-06-09 13:54:31 -0700 (Wed, 09 Jun 2021)
Log Message
HTTP server should run with the same python executable as run-benchmark script.
https://bugs.webkit.org/show_bug.cgi?id=226834
Reviewed by Jonathan Bedard.
'SimpleHTTPServerDriver._ensure_http_server_dependencies' will not work if the
python version used by run-benchmark is not the same as the one invokes http server.
Remove python modules no longer needed by http server.
* Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
(SimpleHTTPServerDriver.serve):
(SimpleHTTPServerDriver._ensure_http_server_dependencies):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (278669 => 278670)
--- trunk/Tools/ChangeLog 2021-06-09 20:46:24 UTC (rev 278669)
+++ trunk/Tools/ChangeLog 2021-06-09 20:54:31 UTC (rev 278670)
@@ -1,3 +1,19 @@
+2021-06-09 Dewei Zhu <[email protected]>
+
+ HTTP server should run with the same python executable as run-benchmark script.
+ https://bugs.webkit.org/show_bug.cgi?id=226834
+
+ Reviewed by Jonathan Bedard.
+
+ 'SimpleHTTPServerDriver._ensure_http_server_dependencies' will not work if the
+ python version used by run-benchmark is not the same as the one invokes http server.
+
+ Remove python modules no longer needed by http server.
+
+ * Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py:
+ (SimpleHTTPServerDriver.serve):
+ (SimpleHTTPServerDriver._ensure_http_server_dependencies):
+
2021-06-09 Fujii Hironori <[email protected]>
CISupport/test-result-archive script reports "SyntaxError: invalid syntax" with Python 3
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py (278669 => 278670)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2021-06-09 20:46:24 UTC (rev 278669)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py 2021-06-09 20:54:31 UTC (rev 278670)
@@ -4,6 +4,7 @@
import os
import re
import subprocess
+import sys
import time
from webkitpy.benchmark_runner.http_server_driver.http_server_driver import HTTPServerDriver
@@ -32,7 +33,7 @@
if self._ip:
interface_args.extend(['--interface', self._ip])
self._server_port = 0
- self._server_process = subprocess.Popen(["python", http_server_path, web_root] + interface_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+ self._server_process = subprocess.Popen([sys.executable, http_server_path, web_root] + interface_args, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
max_attempt = 7
retry_sequence = map(lambda attempt: attempt != max_attempt - 1, range(max_attempt))
interval = 0.5
@@ -106,5 +107,4 @@
def _ensure_http_server_dependencies(self):
_log.info('Ensure dependencies of http server is satisfied')
- from pkg_resources import require, VersionConflict, DistributionNotFound
from webkitpy.autoinstalled import twisted
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
