Title: [238862] trunk/Tools
- Revision
- 238862
- Author
- jbed...@apple.com
- Date
- 2018-12-04 11:00:26 -0800 (Tue, 04 Dec 2018)
Log Message
webkitpy: Support unicode in MeteredStream
https://bugs.webkit.org/show_bug.cgi?id=192260
Reviewed by Aakash Jain.
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): Print message without attempting to encode/decode it.
* Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py:
(RegularTest.test_unicode):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (238861 => 238862)
--- trunk/Tools/ChangeLog 2018-12-04 18:55:27 UTC (rev 238861)
+++ trunk/Tools/ChangeLog 2018-12-04 19:00:26 UTC (rev 238862)
@@ -1,3 +1,18 @@
+2018-12-04 Jonathan Bedard <jbed...@apple.com>
+
+ webkitpy: Support unicode in MeteredStream
+ https://bugs.webkit.org/show_bug.cgi?id=192260
+
+ Reviewed by Aakash Jain.
+
+ 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): Print message without attempting to encode/decode it.
+ * Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py:
+ (RegularTest.test_unicode):
+
2018-12-04 Keith Rollin <krol...@apple.com>
Update scripts for generating .xcfilelist files
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py (238861 => 238862)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py 2018-12-04 18:55:27 UTC (rev 238861)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py 2018-12-04 19:00:26 UTC (rev 238862)
@@ -104,12 +104,10 @@
now_tuple = time.localtime(now)
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)
- else:
- msg = '{}{}'.format(timestamp_string, self._ensure_newline(txt))
+ if not self._isatty or self._verbose:
+ txt = self._ensure_newline(txt)
- self._stream.write(msg)
+ self._stream.write(timestamp_string + txt)
def writeln(self, txt, now=None, pid=None):
self.write(self._ensure_newline(txt), now, pid)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py (238861 => 238862)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py 2018-12-04 18:55:27 UTC (rev 238861)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py 2018-12-04 19:00:26 UTC (rev 238862)
@@ -1,3 +1,5 @@
+# -*- coding: utf-8 -*-
+
# Copyright (C) 2010, 2012 Google Inc. All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -108,7 +110,14 @@
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')
+ self.logger.info('‘example’')
+ self.assertEqual(self.buflist[-1][-14:], '‘example’\n')
+
+
class TtyTest(RegularTest):
verbose = False
isatty = True
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes
