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

Side by Side Diff

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

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

Side by Side Diff: client/tests/kvm/control

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:

View unified diff | Download patch | Annotate | Revision Log

OLD	NEW
1 AUTHOR = """	1 AUTHOR = """

2 uril@redhat.com (Uri Lublin)	2 uril@redhat.com (Uri Lublin)

3 drusso@redhat.com (Dror Russo)	3 drusso@redhat.com (Dror Russo)

4 mgoldish@redhat.com (Michael Goldish)	4 mgoldish@redhat.com (Michael Goldish)

5 dhuff@redhat.com (David Huff)	5 dhuff@redhat.com (David Huff)

6 aeromenk@redhat.com (Alexey Eromenko)	6 aeromenk@redhat.com (Alexey Eromenko)

7 mburns@redhat.com (Mike Burns)	7 mburns@redhat.com (Mike Burns)

8 """	8 """

9 TIME = 'MEDIUM'	9 TIME = 'MEDIUM'

10 NAME = 'KVM test'	10 NAME = 'KVM test'

(...skipping 37 matching lines...) Expand 10 before \| Expand all \| Expand 10 after Loading...
48 str = """	48 str = """

49 # This string will be parsed after tests.cfg. Make any desired changes to the	49 # This string will be parsed after tests.cfg. Make any desired changes to the

50 # test configuration here. For example:	50 # test configuration here. For example:

51 #display = sdl	51 #display = sdl

52 #install\|setup: timeout_multiplier = 3	52 #install\|setup: timeout_multiplier = 3

53 """	53 """

54 tests_cfg = kvm_config.config()	54 tests_cfg = kvm_config.config()

55 tests_cfg_path = os.path.join(kvm_test_dir, "tests.cfg")	55 tests_cfg_path = os.path.join(kvm_test_dir, "tests.cfg")

56 tests_cfg.fork_and_parse(tests_cfg_path, str)	56 tests_cfg.fork_and_parse(tests_cfg_path, str)

57	57

58 pools_cfg_path = os.path.join(kvm_test_dir, "address_pools.cfg")

59 tests_cfg.parse_file(pools_cfg_path)

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

61 if tests_cfg.count("^" + hostname):

62 tests_cfg.parse_string("only ^%s" % hostname)

63 else:

64 tests_cfg.parse_string("only ^default_host")

65

66 # Run the tests	58 # Run the tests

67 kvm_utils.run_tests(tests_cfg.get_generator(), job)	59 kvm_utils.run_tests(tests_cfg.get_generator(), job)

68	60

69 # Generate a nice HTML report inside the job's results dir	61 # Generate a nice HTML report inside the job's results dir

70 kvm_utils.create_report(kvm_test_dir, job.resultdir)	62 kvm_utils.create_report(kvm_test_dir, job.resultdir)

71	63

OLD	NEW

« no previous file with comments | « client/tests/kvm/address_pools.cfg.sample ('k') | client/tests/kvm/control.parallel » ('j') | no next file with comments »