Title: [238764] trunk/Tools
Revision
238764
Author
[email protected]
Date
2018-11-30 16:32:42 -0800 (Fri, 30 Nov 2018)

Log 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):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (238763 => 238764)


--- trunk/Tools/ChangeLog	2018-12-01 00:26:01 UTC (rev 238763)
+++ trunk/Tools/ChangeLog	2018-12-01 00:32:42 UTC (rev 238764)
@@ -1,5 +1,20 @@
 2018-11-30  Jonathan Bedard  <[email protected]>
 
+        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  <[email protected]>
+
         REGRESSION (r238749): run-api-tests dies with AttributeError: 'IOSSimulatorPort' object has no attribute 'DEFAULT_DEVICE_CLASS'
         https://bugs.webkit.org/show_bug.cgi?id=192257
         <rdar://problem/46384671>

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py (238763 => 238764)


--- trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py	2018-12-01 00:26:01 UTC (rev 238763)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py	2018-12-01 00:32:42 UTC (rev 238764)
@@ -105,9 +105,9 @@
             timestamp_string = '%02d:%02d:%02d.%03d %d ' % (now_tuple.tm_hour, now_tuple.tm_min, now_tuple.tm_sec, int((now * 1000) % 1000), pid)
 
         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)
 

Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py (238763 => 238764)


--- trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py	2018-12-01 00:26:01 UTC (rev 238763)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py	2018-12-01 00:32:42 UTC (rev 238764)
@@ -108,7 +108,11 @@
         self.logger.info('foo %s %d', 'bar', 2)
         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):
     verbose = False
     isatty = True
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to