Title: [283936] trunk/Tools
- Revision
- 283936
- Author
- jbed...@apple.com
- Date
- 2021-10-11 14:12:08 -0700 (Mon, 11 Oct 2021)
Log Message
[run-benchmark] Make Python 3 compatible
https://bugs.webkit.org/show_bug.cgi?id=231512
<rdar://problem/84098736>
Reviewed by Dewei Zhu.
* Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py:
(LinuxBrowserDriver.launch_url): Encode Popen call if Python 3.
* Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
(OSXSafariDriver.launch_url): Ditto.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (283935 => 283936)
--- trunk/Tools/ChangeLog 2021-10-11 20:59:43 UTC (rev 283935)
+++ trunk/Tools/ChangeLog 2021-10-11 21:12:08 UTC (rev 283936)
@@ -1,3 +1,16 @@
+2021-10-11 Jonathan Bedard <jbed...@apple.com>
+
+ [run-benchmark] Make Python 3 compatible
+ https://bugs.webkit.org/show_bug.cgi?id=231512
+ <rdar://problem/84098736>
+
+ Reviewed by Dewei Zhu.
+
+ * Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py:
+ (LinuxBrowserDriver.launch_url): Encode Popen call if Python 3.
+ * Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py:
+ (OSXSafariDriver.launch_url): Ditto.
+
2021-10-11 Alex Christensen <achristen...@webkit.org>
Reduce use of TCPServer
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py (283935 => 283936)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py 2021-10-11 20:59:43 UTC (rev 283935)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/linux_browser_driver.py 2021-10-11 21:12:08 UTC (rev 283936)
@@ -99,9 +99,12 @@
self._browser_arguments = [url]
exec_args = [self.process_name] + self._browser_arguments
_log.info('Executing: {browser_cmdline}'.format(browser_cmdline=' '.join(exec_args)))
- self._browser_process = subprocess.Popen(exec_args, env=self._test_environ,
- stdout=subprocess.PIPE,
- stderr=subprocess.STDOUT)
+ self._browser_process = subprocess.Popen(
+ exec_args, env=self._test_environ,
+ stdout=subprocess.PIPE,
+ stderr=subprocess.STDOUT,
+ **(dict(encoding='utf-8') if sys.version_info >= (3, 6) else dict())
+ )
def launch_webdriver(self, url, driver):
try:
Modified: trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py (283935 => 283936)
--- trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2021-10-11 20:59:43 UTC (rev 283935)
+++ trunk/Tools/Scripts/webkitpy/benchmark_runner/browser_driver/osx_safari_driver.py 2021-10-11 21:12:08 UTC (rev 283936)
@@ -67,7 +67,11 @@
_log.info('Checking if any open file is from "{}".'.format(browser_build_path))
# Cannot use 'check_call' here as '+D' option will have non-zero return code when not all files under
# specified folder are used.
- process = subprocess.Popen(['/usr/sbin/lsof', '-a', '-p', str(self._safari_process.pid), '+D', browser_build_absolute_path], stdout=subprocess.PIPE)
+ process = subprocess.Popen(
+ ['/usr/sbin/lsof', '-a', '-p', str(self._safari_process.pid), '+D', browser_build_absolute_path],
+ stdout=subprocess.PIPE,
+ **(dict(encoding='utf-8') if sys.version_info >= (3, 6) else dict())
+ )
output = process.communicate()[0]
if has_safari_app:
assert 'Safari.app/Contents/MacOS/Safari' in output, 'Safari.app is not launched from "{}"'.format(browser_build_path)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
