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

Unified Diff: tools/sharding_supervisor/sharding_supervisor.py

Issue 12079037: Add PRESUBMIT.py to tools/sharding_supervisor/ (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 7 years, 11 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
Index: tools/sharding_supervisor/sharding_supervisor.py
diff --git a/tools/sharding_supervisor/sharding_supervisor.py b/tools/sharding_supervisor/sharding_supervisor.py
index a60598f1a4b9eb56fb2bbcd2f4f72f2356534bab..717efd047c9104008a627205f5528963570eeb29 100755
--- a/tools/sharding_supervisor/sharding_supervisor.py
+++ b/tools/sharding_supervisor/sharding_supervisor.py
@@ -13,8 +13,6 @@ failure for convenience. If only one shard is to be run, a single subprocess
is started for that shard and the output is identical to gtest's output.
"""
-
-import cStringIO
import itertools
import optparse
import os
@@ -31,7 +29,7 @@ from xml.dom import minidom
BASE_PATH = os.path.dirname(os.path.abspath(__file__))
sys.path.append(os.path.join(BASE_PATH, ".."))
try:
- import find_depot_tools
+ import find_depot_tools # pylint: disable=F0401,W0611
# Fixes a bug in Windows where some shards die upon starting
# TODO(charleslee): actually fix this bug
import subprocess2 as subprocess
@@ -257,12 +255,12 @@ class ShardRunner(threading.Thread):
shard = RunShard(
self.supervisor.test, self.supervisor.total_shards, index,
self.supervisor.gtest_args, subprocess.PIPE, subprocess.PIPE)
- buffer = StdioBuffer(shard)
+ buf = StdioBuffer(shard)
csharp 2013/01/29 01:34:18 Why change buffer to buf?
M-A Ruel 2013/01/29 01:36:40 buffer is a builtin, so this code is aliasing it;
# Spawn two threads to collect stdio output
- stdout_collector_thread = buffer.handle_pipe(sys.stdout, shard.stdout)
- stderr_collector_thread = buffer.handle_pipe(sys.stderr, shard.stderr)
+ stdout_collector_thread = buf.handle_pipe(sys.stdout, shard.stdout)
+ stderr_collector_thread = buf.handle_pipe(sys.stderr, shard.stderr)
while shard_running:
- pipe, line = buffer.readline()
+ pipe, line = buf.readline()
if pipe is None and line is None:
shard_running = False
if not line and not shard_running:
@@ -432,7 +430,7 @@ class ShardingSupervisor(object):
for shard_index in range(self.num_shards_to_run):
while True:
try:
- pipe, line = self.shard_output[shard_index].get(True, self.timeout)
+ _, line = self.shard_output[shard_index].get(True, self.timeout)
except Queue.Empty:
# Shard timed out, notice failure and move on.
self.LogShardFailure(shard_index)
@@ -440,7 +438,7 @@ class ShardingSupervisor(object):
# processing in the main thread.
# TODO(maruel): Make sure the worker thread terminates.
sys.stdout.write('TIMED OUT\n\n')
- LogTestFailure(
+ self.LogTestFailure(
'FAILURE: SHARD %d TIMED OUT; %d seconds' % (
shard_index, self.timeout))
break
@@ -453,7 +451,7 @@ class ShardingSupervisor(object):
for shard_index in range(self.num_shards_to_run):
while True:
try:
- pipe, line = self.shard_output[shard_index].get(False)
+ _, line = self.shard_output[shard_index].get(False)
except Queue.Empty:
# Shard timed out, notice failure and move on.
self.LogShardFailure(shard_index)

Powered by Google App Engine
This is Rietveld 408576698