Modified: trunk/Tools/ChangeLog (289702 => 289703)
--- trunk/Tools/ChangeLog 2022-02-13 01:05:02 UTC (rev 289702)
+++ trunk/Tools/ChangeLog 2022-02-13 01:18:45 UTC (rev 289703)
@@ -1,3 +1,20 @@
+2022-02-12 Jonathan Bedard <[email protected]>
+
+ [run-webkit-tests] Do not try and read from /dev/null
+ https://bugs.webkit.org/show_bug.cgi?id=236528
+ <rdar://problem/88836868>
+
+ Reviewed by Alexey Proskuryakov.
+
+ While writing to /dev/null is well defined, reading from it is not. Do not
+ read from /dev/null.
+
+ * Scripts/webkitpy/layout_tests/servers/websocket_server.py:
+ (PyWebSocket.__init__): Delete _wsin.
+ (PyWebSocket._prepare_config): Ditto.
+ (PyWebSocket._spawn_process): Use executive.PIPE instead of os.devnull.
+ (PyWebSocket._stop_running_server): Delete _wsin.
+
2022-02-12 Kevin Turner <[email protected]>
Invoke mouse hover delegate callback on iOS
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py (289702 => 289703)
--- trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py 2022-02-13 01:05:02 UTC (rev 289702)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/servers/websocket_server.py 2022-02-13 01:18:45 UTC (rev 289703)
@@ -79,7 +79,6 @@
self._ca_certificate = ca_certificate
if self._port:
self._port = int(self._port)
- self._wsin = None
self._wsout = None
self._mappings = [{'port': self._port}]
@@ -111,9 +110,6 @@
def _prepare_config(self):
self._filesystem.maybe_make_directory(self._output_dir)
log_file_name = self._log_prefix
- # FIXME: Doesn't Executive have a devnull, so that we don't have to use os.devnull directly?
- self._wsin = open(os.devnull, 'r')
-
error_log = self._filesystem.join(self._output_dir, log_file_name + "-err.txt")
output_log = self._filesystem.join(self._output_dir, log_file_name + "-out.txt")
self._wsout = self._filesystem.open_text_file_for_writing(output_log)
@@ -166,7 +162,7 @@
def _spawn_process(self):
_log.debug('Starting %s server, cmd="%s"' % (self._name, self._start_cmd))
- self._process = self._executive.popen(self._start_cmd, env=self._env, shell=False, stdin=self._wsin, stdout=self._wsout, stderr=self._executive.STDOUT)
+ self._process = self._executive.popen(self._start_cmd, env=self._env, shell=False, stdin=self._executive.PIPE, stdout=self._wsout, stderr=self._executive.STDOUT)
self._filesystem.write_text_file(self._pid_file, str(self._process.pid))
return self._process.pid
@@ -173,9 +169,6 @@
def _stop_running_server(self):
super(PyWebSocket, self)._stop_running_server()
- if self._wsin:
- self._wsin.close()
- self._wsin = None
if self._wsout:
self._wsout.close()
self._wsout = None
