server/hosts/factory.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: server/hosts/factory.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: server/hosts/factory.py

diff --git a/server/hosts/factory.py b/server/hosts/factory.py

index f1a054f590823f1831e7336e1413ea0b92e2380d..7a2a724b72397afc993d94da71ad928a75aaf356 100644

--- a/server/hosts/factory.py

+++ b/server/hosts/factory.py

@@ -68,9 +68,8 @@ def create_host(

site_factory.postprocess_classes(classes, hostname,

auto_monitor=auto_monitor, **args)

- args['user'] = ssh_user

- args['port'] = ssh_port

- args['password'] = ssh_pass

+ hostname, args['user'], args['password'], args['port'] = \

+ server_utils.parse_machine(hostname, ssh_user, ssh_pass, ssh_port)

# create a custom host class for this machine and return an instance of it

host_class = type("%s_host" % hostname, tuple(classes), {})