Title: [112944] trunk/Tools
- Revision
- 112944
- Author
- [email protected]
- Date
- 2012-04-02 14:33:46 -0700 (Mon, 02 Apr 2012)
Log Message
NRWT is not printing out the builder it's uploading JSON files for
https://bugs.webkit.org/show_bug.cgi?id=82834
Reviewed by Ojan Vafai.
Handle log messages of the form log.info("%s", arg) properly ...
I didn't even know you could do that :).
* Scripts/webkitpy/layout_tests/views/metered_stream.py:
(_LogHandler.emit):
* Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py:
(RegularTest.test_log_args):
(VerboseTest.test_log_args):
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (112943 => 112944)
--- trunk/Tools/ChangeLog 2012-04-02 21:23:38 UTC (rev 112943)
+++ trunk/Tools/ChangeLog 2012-04-02 21:33:46 UTC (rev 112944)
@@ -1,3 +1,19 @@
+2012-04-02 Dirk Pranke <[email protected]>
+
+ NRWT is not printing out the builder it's uploading JSON files for
+ https://bugs.webkit.org/show_bug.cgi?id=82834
+
+ Reviewed by Ojan Vafai.
+
+ Handle log messages of the form log.info("%s", arg) properly ...
+ I didn't even know you could do that :).
+
+ * Scripts/webkitpy/layout_tests/views/metered_stream.py:
+ (_LogHandler.emit):
+ * Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py:
+ (RegularTest.test_log_args):
+ (VerboseTest.test_log_args):
+
2012-04-02 Tim Horton <[email protected]>
[mac] LayoutTestHelper crashes if there is no main display
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py (112943 => 112944)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py 2012-04-02 21:23:38 UTC (rev 112943)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream.py 2012-04-02 21:33:46 UTC (rev 112944)
@@ -122,4 +122,4 @@
self.name = LOG_HANDLER_NAME
def emit(self, record):
- self._meter.writeln(record.msg, record.created)
+ self._meter.writeln(record.getMessage(), record.created)
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py (112943 => 112944)
--- trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py 2012-04-02 21:23:38 UTC (rev 112943)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/views/metered_stream_unittest.py 2012-04-02 21:33:46 UTC (rev 112944)
@@ -104,6 +104,9 @@
buflist = self._log_after_update()
self.assertEquals(buflist, ['foo\n', 'bar\n'])
+ def test_log_args(self):
+ self.logger.info('foo %s %d', 'bar', 2)
+ self.assertEquals(self.buflist, ['foo bar 2\n'])
class TtyTest(RegularTest):
verbose = False
@@ -138,6 +141,11 @@
self.assertEquals(len(buflist), 2)
self.assertTrue(re.match('\d\d:\d\d:\d\d.\d\d\d \d+ bar\n', buflist[1]))
+ def test_log_args(self):
+ self.logger.info('foo %s %d', 'bar', 2)
+ self.assertEquals(len(self.buflist), 1)
+ self.assertTrue(self.buflist[0].endswith('foo bar 2\n'))
+
if __name__ == '__main__':
unittest.main()
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
