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

Unified Diff: git_cl/test/local_rietveld.py

Issue 6684025: Don't buffer output in-memory for rietveld server - it logs to stdout by (Closed) Base URL: http://src.chromium.org/svn/trunk/tools/depot_tools
Patch Set: Created 9 years, 9 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: git_cl/test/local_rietveld.py
diff --git a/git_cl/test/local_rietveld.py b/git_cl/test/local_rietveld.py
index 95e27b60b3bac41052abc90a99a90ac47df97b3e..88071c467f1a96200a8c4d57fcc3cdd11547b9b5 100644
--- a/git_cl/test/local_rietveld.py
+++ b/git_cl/test/local_rietveld.py
@@ -96,16 +96,16 @@ class LocalRietveld(object):
self.install_prerequisites()
self.port = find_free_port()
if verbose:
- stdout = None
- stderr = None
+ self.out = None
+ self.err = None
else:
- stdout = subprocess.PIPE
- stderr = subprocess.PIPE
+ self.out = open(os.devnull, 'w')
+ self.err = open(os.devnull, 'w')
output = []
self.test_server = subprocess.Popen(
[self.dev_app, self.rietveld, '--port=%d' % self.port,
'--datastore_path=' + os.path.join(self.rietveld, 'tmp.db'), '-c'],
- stdout=stdout, stderr=stderr, env=self.env)
+ stdout=self.out, stderr=self.err, env=self.env)
# Loop until port 127.0.0.1:port opens or the process dies.
while not test_port(self.port):
self.test_server.poll()
@@ -120,6 +120,12 @@ class LocalRietveld(object):
self.test_server.kill()
self.test_server = None
self.port = None
+ if self.out:
+ self.out.close()
+ self.out = None
+ if self.err:
+ self.err.close()
+ self.err = None
def main():
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698