Changeset 58503 in webkit

Timestamp:

Apr 29, 2010 4:29:07 AM (14 years ago)

Author:

eric@webkit.org

Message:

2010-04-29 Eric Seidel <​eric@webkit.org>

Reviewed by Adam Barth.

new-run-webkit-tests can deadlock with Chromium's TestShell
​https://bugs.webkit.org/show_bug.cgi?id=38298

Fix _write_command_and_read_line to never send unicode() to
test_shell, instead to always encode as utf-8. This was causing
random hangs because if test_shell ever encounters a \0 in the
stream it can deadlock with NRWT.

There is still a deadlock bug to fix in NRWT/test_shell design, however
this fix should make the deadlock occur less often.

• Scripts/webkitpy/layout_tests/port/chromium.py:
• Scripts/webkitpy/layout_tests/port/chromium_unittest.py:

Location:

trunk/WebKitTools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/port/chromium_unittest.py (modified) (2 diffs)

trunk/WebKitTools/ChangeLog

@@ +1 @@
+2010-04-29  Eric Seidel  <eric@webkit.org>
+
+        Reviewed by Adam Barth.
+
+        new-run-webkit-tests can deadlock with Chromium's TestShell
+        https://bugs.webkit.org/show_bug.cgi?id=38298
+
+        Fix _write_command_and_read_line to never send unicode() to
+        test_shell, instead to always encode as utf-8.  This was causing
+        random hangs because if test_shell ever encounters a \0 in the
+        stream it can deadlock with NRWT.
+
+        There is still a deadlock bug to fix in NRWT/test_shell design, however
+        this fix should make the deadlock occur less often.
+
+        * Scripts/webkitpy/layout_tests/port/chromium.py:
+        * Scripts/webkitpy/layout_tests/port/chromium_unittest.py:
+
 2010-04-29  Chris Jerdonek  <cjerdonek@webkit.org>
 

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium.py

@@ -320 +320 @@
         try:
             if input:
+                if isinstance(input, unicode):
+                    # TestShell expects utf-8
+                    input = input.encode("utf-8")
                 self._proc.stdin.write(input)
             # DumpRenderTree text output is always UTF-8.  However some tests

trunk/WebKitTools/Scripts/webkitpy/layout_tests/port/chromium_unittest.py

@@ -29 +29 @@
 import chromium
 import unittest
+import StringIO
 
 from webkitpy.thirdparty.mock import Mock
@@ -45 +46 @@
         expected_command = "test.html 2 checksum\n"
         self.assertEqual(self.driver._test_shell_command("test.html", 2, "checksum"), expected_command)
+
+    def _assert_write_command_and_read_line(self, input=None, expected_line=None, expected_stdin=None, expected_crash=False):
+        if not expected_stdin:
+            if input:
+                expected_stdin = input
+            else:
+                # We reset stdin, so we should expect stdin.getValue = ""
+                expected_stdin = ""
+        self.driver._proc.stdin = StringIO.StringIO()
+        line, did_crash = self.driver._write_command_and_read_line(input)
+        self.assertEqual(self.driver._proc.stdin.getvalue(), expected_stdin)
+        self.assertEqual(line, expected_line)
+        self.assertEqual(did_crash, expected_crash)
+
+    def test_write_command_and_read_line(self):
+        self.driver._proc = Mock()
+        # Set up to read 3 lines before we get an IOError
+        self.driver._proc.stdout = StringIO.StringIO("first\nsecond\nthird\n")
+
+        unicode_input = u"I \u2661 Unicode"
+        utf8_input = unicode_input.encode("utf-8")
+        # Test unicode input conversion to utf-8
+        self._assert_write_command_and_read_line(input=unicode_input, expected_stdin=utf8_input, expected_line="first\n")
+        # Test str() input.
+        self._assert_write_command_and_read_line(input="foo", expected_line="second\n")
+        # Test input=None
+        self._assert_write_command_and_read_line(expected_line="third\n")
+        # Test reading from a closed/empty stream.
+        # reading from a StringIO does not raise IOError like a real file would, so raise IOError manually.
+        def mock_readline():
+            raise IOError
+        self.driver._proc.stdout.readline = mock_readline
+        self._assert_write_command_and_read_line(expected_crash=True)