Changeset 239303 in webkit

Timestamp:

Dec 17, 2018 4:12:06 PM (5 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Handle case where stdout and stderr don't accept unicode
​https://bugs.webkit.org/show_bug.cgi?id=192775
<rdar://problem/46497303>

Reviewed by Stephanie Lewis.

• Scripts/webkitpy/layout_tests/views/metered_stream.py:

(MeteredStream.write): If unicode cannot be written to the stream, replace unicode
characters with '?'.

• Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py:

(RegularTest.test_stream_with_encoding):

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/layout_tests/views/metered_stream.py (modified) (1 diff)
• Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2018-12-17  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Handle case where stdout and stderr don't accept unicode
+        https://bugs.webkit.org/show_bug.cgi?id=192775
+        <rdar://problem/46497303>
+
+        Reviewed by Stephanie Lewis.
+
+        * Scripts/webkitpy/layout_tests/views/metered_stream.py:
+        (MeteredStream.write): If unicode cannot be written to the stream, replace unicode
+        characters with '?'.
+        * Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py:
+        (RegularTest.test_stream_with_encoding):
+
 2018-12-17  Daniel Bates  <dabates@apple.com>
 

trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py

@@ -108 +108 @@
             txt = self._ensure_newline(txt)
 
-        self._stream.write(timestamp_string + txt)
+        try:
+            self._stream.write(timestamp_string + txt)
+        except UnicodeEncodeError:
+            output = ''
+            for c in timestamp_string + txt:
+                try:
+                    output += '{}'.format(c)
+                except UnicodeEncodeError:
+                    output += '?'
+            self._stream.write(output)
 
     def writeln(self, txt, now=None, pid=None):

trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py

@@ -118 +118 @@
         self.assertEqual(self.buflist[-1][-14:], '‘example’\n')
 
+    def test_stream_with_encoding(self):
+        class AsciiStream(StringIO.StringIO):
+            def write(self, s):
+                return StringIO.StringIO.write(self, '{}'.format(s))
+
+        stream = AsciiStream()
+
+        logger = logging.getLogger(__name__)
+        logger.setLevel(logging.DEBUG)
+        logger.propagate = False
+
+        try:
+            meter = MeteredStream(stream, self.verbose, logger, self.time_fn, 8675, print_timestamps=self.print_timestamps)
+            self.logger.info(u'\u2713')
+            self.assertEqual(stream.buflist[-1][-2:], '?\n')
+        finally:
+            meter.cleanup()
+
 
 class TtyTest(RegularTest):