<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[217758] trunk/Tools</title>
</head>
<body>

<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt;  }
#msg dl a { font-weight: bold}
#msg dl a:link    { color:#fc3; }
#msg dl a:active  { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff  {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.webkit.org/projects/webkit/changeset/217758">217758</a></dd>
<dt>Author</dt> <dd>jbedard@apple.com</dd>
<dt>Date</dt> <dd>2017-06-03 09:11:31 -0700 (Sat, 03 Jun 2017)</dd>
</dl>

<h3>Log Message</h3>
<pre>webkitpy: Add contextmanager to disable logging for a block
https://bugs.webkit.org/show_bug.cgi?id=172876

Reviewed by Daniel Bates.

Add a context manager which will use an OutputCapture object to capture logging
in a block and hold it in a variable.

* Scripts/webkitpy/common/system/outputcapture.py:
(OutputCaptureScope):
(OutputCaptureScope.__init__): Construct with OutputCapture object.
(OutputCaptureScope.__enter__): Begin capturing output.
(OutputCaptureScope.__exit__): Restore output and save captured output to a variable.
output and retain the resulting log.
* Scripts/webkitpy/common/system/outputcapture_unittest.py:
(OutputCaptureTest.test_output_capture_scope): Added.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkToolsChangeLog">trunk/Tools/ChangeLog</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemoutputcapturepy">trunk/Tools/Scripts/webkitpy/common/system/outputcapture.py</a></li>
<li><a href="#trunkToolsScriptswebkitpycommonsystemoutputcapture_unittestpy">trunk/Tools/Scripts/webkitpy/common/system/outputcapture_unittest.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkToolsChangeLog"></a>
<div class="modfile"><h4>Modified: trunk/Tools/ChangeLog (217757 => 217758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/ChangeLog    2017-06-03 15:26:03 UTC (rev 217757)
+++ trunk/Tools/ChangeLog       2017-06-03 16:11:31 UTC (rev 217758)
</span><span class="lines">@@ -1,3 +1,22 @@
</span><ins>+2017-06-03  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Add contextmanager to disable logging for a block
+        https://bugs.webkit.org/show_bug.cgi?id=172876
+
+        Reviewed by Daniel Bates.
+
+        Add a context manager which will use an OutputCapture object to capture logging
+        in a block and hold it in a variable.
+
+        * Scripts/webkitpy/common/system/outputcapture.py:
+        (OutputCaptureScope):
+        (OutputCaptureScope.__init__): Construct with OutputCapture object.
+        (OutputCaptureScope.__enter__): Begin capturing output. 
+        (OutputCaptureScope.__exit__): Restore output and save captured output to a variable.
+        output and retain the resulting log.
+        * Scripts/webkitpy/common/system/outputcapture_unittest.py:
+        (OutputCaptureTest.test_output_capture_scope): Added.
+
</ins><span class="cx"> 2017-06-02  Zalan Bujtas  <zalan@apple.com>
</span><span class="cx"> 
</span><span class="cx">         Cleanup FrameView::autoSizeIfEnabled.
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemoutputcapturepy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/outputcapture.py (217757 => 217758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/outputcapture.py      2017-06-03 15:26:03 UTC (rev 217757)
+++ trunk/Tools/Scripts/webkitpy/common/system/outputcapture.py 2017-06-03 16:11:31 UTC (rev 217758)
</span><span class="lines">@@ -107,6 +107,19 @@
</span><span class="cx">         return return_value
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+class OutputCaptureScope(object):
+
+    def __init__(self, output_capture=OutputCapture()):
+        self._output_capture = output_capture
+        self.captured_output = (None, None, None)
+
+    def __enter__(self):
+        self._output_capture.capture_output()
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.captured_output = self._output_capture.restore_output()
+
+
</ins><span class="cx"> class OutputCaptureTestCaseBase(unittest.TestCase):
</span><span class="cx">     maxDiff = None
</span><span class="cx"> 
</span></span></pre></div>
<a id="trunkToolsScriptswebkitpycommonsystemoutputcapture_unittestpy"></a>
<div class="modfile"><h4>Modified: trunk/Tools/Scripts/webkitpy/common/system/outputcapture_unittest.py (217757 => 217758)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/Tools/Scripts/webkitpy/common/system/outputcapture_unittest.py     2017-06-03 15:26:03 UTC (rev 217757)
+++ trunk/Tools/Scripts/webkitpy/common/system/outputcapture_unittest.py        2017-06-03 16:11:31 UTC (rev 217758)
</span><span class="lines">@@ -23,7 +23,7 @@
</span><span class="cx"> import logging
</span><span class="cx"> import unittest
</span><span class="cx"> 
</span><del>-from webkitpy.common.system.outputcapture import OutputCapture
</del><ins>+from webkitpy.common.system.outputcapture import OutputCapture, OutputCaptureScope
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx"> _log = logging.getLogger(__name__)
</span><span class="lines">@@ -57,3 +57,19 @@
</span><span class="cx">         self.output.set_log_level(logging.WARN)
</span><span class="cx">         self.log_all_levels()
</span><span class="cx">         self.assertLogged('ERROR\nCRITICAL\nWARN\nERROR\nCRITICAL\n')
</span><ins>+
+    def test_output_capture_scope(self):
+        scope = OutputCaptureScope()
+        with scope:
+            print 'STRING 1'
+        self.assertEqual(('STRING 1\n', '', ''), scope.captured_output)
+
+        with scope:
+            print 'STRING 2'
+        self.assertEqual(('STRING 2\n', '', ''), scope.captured_output)
+
+    def test_output_capture_scope_from_output_capture(self):
+        scope = OutputCaptureScope(self.output)
+        with scope:
+            self.log_all_levels()
+        self.assertEqual(('', '', 'INFO\nWARN\nERROR\nCRITICAL\n'), scope.captured_output)
</ins></span></pre>
</div>
</div>

</body>
</html>