scheduler/drone_manager.py - Issue 6246035: Merge remote branch 'cros/upstream' into master

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: scheduler/drone_manager.py

Issue 6246035: Merge remote branch 'cros/upstream' into master (Closed) Base URL: ssh://git@gitrw.chromium.org:9222/autotest.git@master

Patch Set: patch Created 9 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:

Index: scheduler/drone_manager.py

diff --git a/scheduler/drone_manager.py b/scheduler/drone_manager.py

index 75724f382b83c0849b01ff2ed5194134ab4c0ff1..e094f14f1fb080ef9108b90b287b0b46f49e78ae 100644

--- a/scheduler/drone_manager.py

+++ b/scheduler/drone_manager.py

@@ -159,8 +159,7 @@ class DroneManager(object):

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 @@ class DroneManager(object):

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):

« cli/job.py ('K') | « global_config.ini ('k') | scheduler/drones.py » ('j') | no next file with comments »