Changeset 244080 in webkit

Timestamp:

Apr 9, 2019, 9:14:43 AM (7 years ago)

Author:

Jonathan Bedard

Message:

iOS 12 Simulator Release WK2 frequently timing out while running layout tests
​https://bugs.webkit.org/show_bug.cgi?id=196694
<rdar://problem/48388734>

Rubber-stamped by Aakash Jain.

• Scripts/webkitpy/port/image_diff.py:

(ImageDiffer.diff_image): If the ImageDiff process has data, kill it before running again.

• Scripts/webkitpy/port/server_process.py:

(ServerProcess.has_available_stdout): Check if stdout has data in it.
(ServerProcess._wait_for_data_and_update_buffers_using_select):
(ServerProcess._wait_for_data_and_update_buffers_using_win32_apis):

• Scripts/webkitpy/port/server_process_mock.py:

(MockServerProcess.has_available_stdout):

• Scripts/webkitpy/port/server_process_unittest.py:

(TestServerProcess.serial_test_basic):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/port/image_diff.py (modified) (1 diff)
• Scripts/webkitpy/port/server_process.py (modified) (5 diffs)
• Scripts/webkitpy/port/server_process_mock.py (modified) (1 diff)
• Scripts/webkitpy/port/server_process_unittest.py (modified) (2 diffs)

trunk/Tools/ChangeLog

@@ +1 @@
+2019-04-09  Jonathan Bedard  <jbedard@apple.com>
+
+        iOS 12 Simulator Release WK2 frequently timing out while running layout tests
+        https://bugs.webkit.org/show_bug.cgi?id=196694
+        <rdar://problem/48388734>
+
+        Rubber-stamped by Aakash Jain.
+
+        * Scripts/webkitpy/port/image_diff.py:
+        (ImageDiffer.diff_image): If the ImageDiff process has data, kill it before running again.
+        * Scripts/webkitpy/port/server_process.py:
+        (ServerProcess.has_available_stdout): Check if stdout has data in it.
+        (ServerProcess._wait_for_data_and_update_buffers_using_select):
+        (ServerProcess._wait_for_data_and_update_buffers_using_win32_apis):
+        * Scripts/webkitpy/port/server_process_mock.py:
+        (MockServerProcess.has_available_stdout):
+        * Scripts/webkitpy/port/server_process_unittest.py:
+        (TestServerProcess.serial_test_basic):
+
 2019-04-09  Jer Noble  <jer.noble@apple.com>
 

trunk/Tools/Scripts/webkitpy/port/image_diff.py

@@ -48 +48 @@
 
     def diff_image(self, expected_contents, actual_contents, tolerance):
-        if tolerance != self._tolerance:
+        if tolerance != self._tolerance or (self._process and self._process.has_available_stdout()):
             self.stop()
         try:

trunk/Tools/Scripts/webkitpy/port/server_process.py

@@ -204 +204 @@
         return self._read(deadline, self._pop_stdout_line_if_ready)
 
+    def has_available_stdout(self):
+        if not self.has_crashed() and self._use_win32_apis:
+            self._wait_for_data_and_update_buffers_using_win32_apis(0)
+        elif not self.has_crashed():
+            self._wait_for_data_and_update_buffers_using_select(0)
+
+        return bool(self._output)
+
     def read_stderr_line(self, deadline):
         return self._read(deadline, self._pop_stderr_line_if_ready)
@@ -257 +265 @@
 
     def _wait_for_data_and_update_buffers_using_select(self, deadline, stopping=False):
-        if self._proc.stdout.closed or self._proc.stderr.closed:
+        if not self._proc or self._proc.stdout.closed or self._proc.stderr.closed:
             # If the process crashed and is using FIFOs, like Chromium Android, the
             # stdout and stderr pipes will be closed.
@@ -301 +309 @@
 
     def _wait_for_data_and_update_buffers_using_win32_apis(self, deadline):
+        if not self._proc:
+            return
+
         # See http://code.activestate.com/recipes/440554-module-to-allow-asynchronous-subprocess-use-on-win/
         # and http://docs.activestate.com/activepython/2.6/pywin32/modules.html
@@ -306 +317 @@
         out_fh = msvcrt.get_osfhandle(self._proc.stdout.fileno())
         err_fh = msvcrt.get_osfhandle(self._proc.stderr.fileno())
-        while time.time() < deadline:
+        checking = True
+        while checking:
             output = self._non_blocking_read_win32(out_fh)
             error = self._non_blocking_read_win32(err_fh)
@@ -318 +330 @@
                 return
             time.sleep(0.01)
+            checking = time.time() < deadline
 
     def _non_blocking_read_win32(self, handle):

trunk/Tools/Scripts/webkitpy/port/server_process_mock.py

@@ -55 +55 @@
         return self.lines.pop(0) + "\n"
 
+    def has_available_stdout(self):
+        if self.has_crashed():
+            return False
+        return bool(self.lines)
+
     def read_stdout(self, deadline, size):
         if self.has_crashed():

trunk/Tools/Scripts/webkitpy/port/server_process_unittest.py

@@ -102 +102 @@
     def serial_test_basic(self):
         # Give -u switch to force stdout and stderr to be unbuffered for Windows
-        cmd = [sys.executable, '-uc', 'import sys; print "stdout"; print >>sys.stderr, "stderr"; sys.stdin.readline();']
+        cmd = [sys.executable, '-uc', 'import sys; print "stdout"; print "again"; print >>sys.stderr, "stderr"; sys.stdin.readline();']
         host = SystemHost()
         factory = PortFactory(host)
@@ -121 +121 @@
         self.assertEqual(line.strip(), "stdout")
 
+        self.assertTrue(proc.has_available_stdout())
+
         line = proc.read_stderr_line(now + 1.0)
         self.assertEqual(line.strip(), "stderr")
+
+        line = proc.read_stdout_line(now + 1.0)
+        self.assertEqual(line.strip(), "again")
+        self.assertFalse(proc.has_available_stdout())
 
         proc.write('End\n')