Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(15)

Unified Diff: slave/skia_slave_scripts/run_bench.py

Issue 23548042: Use shell_utils' log_in_real_time=False for some git commands (Closed) Base URL: http://skia.googlecode.com/svn/buildbot/
Patch Set: Created 7 years, 3 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 | « no previous file | slave/skia_slave_scripts/utils/gclient_utils.py » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: slave/skia_slave_scripts/run_bench.py
===================================================================
--- slave/skia_slave_scripts/run_bench.py (revision 11306)
+++ slave/skia_slave_scripts/run_bench.py (working copy)
@@ -10,7 +10,6 @@
import os
import re
import sys
-import time
GIT = 'git.bat' if os.name == 'nt' else 'git'
@@ -26,20 +25,14 @@
def GetSvnRevision(commit_hash):
- # Run "git show" in a retry loop, because it occasionally fails.
- for i in xrange(30):
- output = shell_utils.Bash([GIT, 'show', commit_hash], echo=False)
- if output:
- results = re.findall(GIT_SVN_ID_MATCH_STR, output)
- if results:
- return results[0]
- else:
- print 'No git-svn-id found for %s\nOutput:\n%s' % (commit_hash, output)
- else:
- # Sleep for 1 second and hope the next iteration gives us output.
- print 'No output from "git show", retrying.. #%s' % (i + 1)
- time.sleep(1)
- raise Exception('Unable to parse git-svn-id!')
+ output = shell_utils.Bash([GIT, 'show', commit_hash], echo=False,
+ log_in_real_time=False)
+ results = re.findall(GIT_SVN_ID_MATCH_STR, output)
+ if results:
+ return results[0]
+ else:
+ raise Exception('No git-svn-id found for %s\nOutput:\n%s' % (commit_hash,
+ output))
class RunBench(BuildStep):
« no previous file with comments | « no previous file | slave/skia_slave_scripts/utils/gclient_utils.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698