Index: build/android/buildbot/tests/bb_run_bot_test.py |
diff --git a/build/android/buildbot/tests/bb_run_bot_test.py b/build/android/buildbot/tests/bb_run_bot_test.py |
index 1d44e7e2165d82dd78c3a9fb81d055cc30d15ed4..810c60dac2f39773d6f680f9c1d537f08f942f6d 100755 |
--- a/build/android/buildbot/tests/bb_run_bot_test.py |
+++ b/build/android/buildbot/tests/bb_run_bot_test.py |
@@ -11,24 +11,24 @@ BUILDBOT_DIR = os.path.join(os.path.dirname(__file__), '..') |
sys.path.append(BUILDBOT_DIR) |
import bb_run_bot |
-def RunBotsWithTesting(bot_step_map): |
+def RunBotProcesses(bot_process_map): |
code = 0 |
- procs = [ |
- (bot, subprocess.Popen( |
- [os.path.join(BUILDBOT_DIR, 'bb_run_bot.py'), '--bot-id', bot, |
- '--testing'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)) |
- for bot in bot_step_map] |
- for bot, proc in procs: |
+ for bot, proc in bot_process_map: |
_, err = proc.communicate() |
code |= proc.returncode |
if proc.returncode != 0: |
- print 'Error running bb_run_bot with id="%s"' % bot, err |
+ print 'Error running the bot script with id="%s"' % bot, err |
return code |
def main(): |
- return RunBotsWithTesting(bb_run_bot.GetBotStepMap()) |
+ procs = [ |
+ (bot, subprocess.Popen( |
+ [os.path.join(BUILDBOT_DIR, 'bb_run_bot.py'), '--bot-id', bot, |
+ '--testing'], stdout=subprocess.PIPE, stderr=subprocess.PIPE)) |
+ for bot in bb_run_bot.GetBotStepMap()] |
+ return RunBotProcesses(procs) |
if __name__ == '__main__': |