third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.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/tool/commands/rebaseline.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/tool/commands/helpcommand.py ('k') | third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline_unittest.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

diff --git a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

index 49aea6ef8ac224de882586a188db4625fe3a4d6b..af749392313cfc6b4d4719a9185544d612ff28f9 100644

--- a/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

+++ b/third_party/WebKit/Tools/Scripts/webkitpy/tool/commands/rebaseline.py

@@ -835,7 +835,7 @@ class AutoRebaseline(AbstractParallelRebaselineCommand):

last_output_time = time.time()

# git cl sometimes completely hangs. Bail if we haven't gotten any output to stdout/stderr in a while.

- while process.poll() == None and time.time() < last_output_time + self.SECONDS_BEFORE_GIVING_UP:

+ while process.poll() is None and time.time() < last_output_time + self.SECONDS_BEFORE_GIVING_UP:

# FIXME: This doesn't make any sense. readline blocks, so all this code to

# try and bail is useless. Instead, we should do the readline calls on a

# subthread. Then the rest of this code would make sense.

@@ -844,7 +844,7 @@ class AutoRebaseline(AbstractParallelRebaselineCommand):

last_output_time = time.time()

_log.info(out)

- if process.poll() == None:

+ if process.poll() is None:

_log.error('Command hung: %s' % subprocess_command)

return False

return True