Changeset 238764 in webkit

Timestamp:

Nov 30, 2018 4:32:42 PM (5 years ago)

Author:

Jonathan Bedard

Message:

webkitpy: Support unicode in MeteredStream
​https://bugs.webkit.org/show_bug.cgi?id=192260

Reviewed by Stephanie Lewis.

It's possible that the test runner returns unicode characters to be logged when
running layout tests.

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

(MeteredStream.write): Message written to metered stream should be unicode.

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

(RegularTest.test_unicode):

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-11-30  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Support unicode in MeteredStream
+        https://bugs.webkit.org/show_bug.cgi?id=192260
+
+        Reviewed by Stephanie Lewis.
+
+        It's possible that the test runner returns unicode characters to be logged when
+        running layout tests.
+
+        * Scripts/webkitpy/layout_tests/views/metered_stream.py:
+        (MeteredStream.write): Message written to metered stream should be unicode.
+        * Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py:
+        (RegularTest.test_unicode):
+
 2018-11-30  Jonathan Bedard  <jbedard@apple.com>
 

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

@@ -106 +106 @@
 
         if self._isatty and not self._verbose:
-            msg = '{}{}'.format(timestamp_string, txt)
+            msg = u'{}{}'.format(timestamp_string, txt)
         else:
-            msg = '{}{}'.format(timestamp_string, self._ensure_newline(txt))
+            msg = u'{}{}'.format(timestamp_string, self._ensure_newline(txt))
 
         self._stream.write(msg)

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

@@ -109 +109 @@
         self.assertEqual(self.buflist, ['foo bar 2\n'])
 
+    def test_unicode(self):
+        self.logger.info(u'\u2713')
+        self.assertEqual(self.buflist[-1][-2:], u'\u2713\n')
+
 
 class TtyTest(RegularTest):