Changeset 278670 in webkit

Timestamp:

Jun 9, 2021, 1:54:31 PM (5 years ago)

Author:

Dewei Zhu

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):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py (modified) (3 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2021-06-09  Dewei Zhu  <dewei_zhu@apple.com>
+
+        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  <Hironori.Fujii@sony.com>
 

trunk/Tools/Scripts/webkitpy/benchmark_runner/http_server_driver/simple_http_server_driver.py

@@ -5 +5 @@
 import re
 import subprocess
+import sys
 import time
 
@@ -33 +34 @@
             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))
@@ -107 +108 @@
     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