client/tests/kvm/control.parallel - Issue 4823005: Merge remote branch 'cros/upstream' into tempbranch

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: client/tests/kvm/control.parallel

Issue 4823005: Merge remote branch 'cros/upstream' into tempbranch (Closed) Base URL: http://git.chromium.org/git/autotest.git@master

Patch Set: patch Created 10 years, 1 month 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: client/tests/kvm/control.parallel

diff --git a/client/tests/kvm/control.parallel b/client/tests/kvm/control.parallel

index 07bc6e5f6be8bb953247e1faad37e693ed276be4..ac84638aa6dd0384d3f58032ef4e31b4ebef6b45 100644

--- a/client/tests/kvm/control.parallel

+++ b/client/tests/kvm/control.parallel

@@ -171,15 +171,6 @@ cfg = kvm_config.config()

filename = os.path.join(pwd, "tests.cfg")

cfg.fork_and_parse(filename, str)

-filename = os.path.join(pwd, "address_pools.cfg")

-if os.path.exists(filename):

- cfg.parse_file(filename)

- hostname = os.uname()[1].split(".")[0]

- if cfg.count("^" + hostname):

- cfg.parse_string("only ^%s" % hostname)

- else:

- cfg.parse_string("only ^default_host")

tests = cfg.get_list()

« no previous file with comments | « client/tests/kvm/control ('k') | client/tests/kvm/get_started.py » ('j') | no next file with comments »