commit 18040e4aab5367670245b13f5ed9ce08f6ef61be
author Dan Shi <dshi@chromium.org> Wed Sep 03 11:14:00 2014 -0700
committer chrome-internal-fetch <chrome-internal-fetch@google.com> Thu Sep 04 15:49:00 2014 +0000
tree cbdd4565168651a8479bdbc569296f97abb1ddcb
parent acdb0134ec8ebbe16ee8df89b383202d55a102e1

[autotest] update _check_servod_status to allow multiple servod processes.

BUG=chromium:410141
TEST=test_that in local setup

Change-Id: If736a80f92627aab6e17d3ff8a713e8a89f94720
Reviewed-on: https://chromium-review.googlesource.com/216220
Tested-by: Dan Shi <dshi@chromium.org>
Reviewed-by: Richard Barnette <jrbarnette@chromium.org>
Commit-Queue: Dan Shi <dshi@chromium.org>

server/hosts/servo_host.py

diff --git a/server/hosts/servo_host.py b/server/hosts/servo_host.py
index 5a6d7cf..0f58b05 100644
--- a/server/hosts/servo_host.py
+++ b/server/hosts/servo_host.py
@@ -374,8 +374,9 @@
 
         """
         try:
-            pid = int(self.run('pgrep servod').stdout.strip())
-            logging.info('servod is running, PID=%d', pid)
+            pids = [str(int(s)) for s in
+                    self.run('pgrep servod').stdout.strip().split('\n')]
+            logging.info('servod is running, PID=%s', ','.join(pids))
         except (error.AutoservRunError, error.AutoservSSHTimeout) as e:
             if self._is_localhost:
                 logging.info('Ignoring servod status check failure. servo host '