Merge remote branch 'cros/upstream' into autotest-rebase
Merged to upstream trunk@5066, from trunk@4749.
There is no way I could enlist each individual CL from the upstream here since it will blow up the changelist description field.
BUG=
TEST=
Had patched this CL into a fresh cut client to avoid any side effect.
run_remote_test bvt from both emerged location and third_party/autotest/file.
Both test passed!
We should also keep any eye on this to see how it gets propagated into cautotest server.
TBR=dalecurtis
Change-Id: I72f2bc7a9de530178484aea1bfb5ace68bcad029
diff --git a/scheduler/drone_manager.py b/scheduler/drone_manager.py
index 75724f3..e094f14 100644
--- a/scheduler/drone_manager.py
+++ b/scheduler/drone_manager.py
@@ -159,8 +159,7 @@
self._results_dir = base_results_dir
for hostname in drone_hostnames:
- drone = self._add_drone(hostname)
- drone.call('initialize', self.absolute_path(''))
+ self._add_drone(hostname)
if not self._drones:
# all drones failed to initialize
@@ -205,8 +204,9 @@
def _add_drone(self, hostname):
logging.info('Adding drone %s' % hostname)
drone = drones.get_drone(hostname)
- self._drones[drone.hostname] = drone
- return drone
+ if drone:
+ self._drones[drone.hostname] = drone
+ drone.call('initialize', self.absolute_path(''))
def _remove_drone(self, hostname):