third_party/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture.py - Issue 2014063002: Run format-webkit on webkitpy code (without string conversion).

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture.py

Issue 2014063002: Run format-webkit on webkitpy code (without string conversion). (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Rebased Created 4 years, 7 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/WebKit/Tools/Scripts/webkitpy/common/system/logtesting.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/common/system/platforminfo.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture.py b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture.py

index b9b0a0839425910660de41f33633875c18f2b05f..f08fc9617f2ca00b37a5fa72360b31929f5b3ab7 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/common/system/outputcapture.py

@@ -79,7 +79,8 @@ class OutputCapture(object):

delattr(self, '_logs')

return (self._restore_output_with_name("stdout"), self._restore_output_with_name("stderr"), logs_string)

- def assert_outputs(self, testcase, function, args=[], kwargs={}, expected_stdout="", expected_stderr="", expected_exception=None, expected_logs=None):

+ def assert_outputs(self, testcase, function, args=[], kwargs={}, expected_stdout="",

+ expected_stderr="", expected_exception=None, expected_logs=None):

self.capture_output()

try:

if expected_exception: