| OLD | NEW |
|---|
| 1 import installer | 1 from autotest_lib.client.virt import kvm_installer |
| 2 | 2 |
| 3 | 3 |
| 4 def run_build(test, params, env): | 4 def run_build(test, params, env): |
| 5 """ | 5 """ |
| 6 Installs KVM using the selected install mode. Most install methods will | 6 Installs KVM using the selected install mode. Most install methods will |
| 7 take kvm source code, build it and install it to a given location. | 7 take kvm source code, build it and install it to a given location. |
| 8 | 8 |
| 9 @param test: kvm test object. | 9 @param test: kvm test object. |
| 10 @param params: Dictionary with test parameters. | 10 @param params: Dictionary with test parameters. |
| 11 @param env: Test environment. | 11 @param env: Test environment. |
| 12 """ | 12 """ |
| 13 srcdir = params.get("srcdir", test.srcdir) | 13 srcdir = params.get("srcdir", test.srcdir) |
| 14 params["srcdir"] = srcdir | 14 params["srcdir"] = srcdir |
| 15 | 15 |
| 16 try: | 16 try: |
| 17 installer_object = installer.make_installer(params) | 17 installer_object = kvm_installer.make_installer(params) |
| 18 installer_object.set_install_params(test, params) | 18 installer_object.set_install_params(test, params) |
| 19 installer_object.install() | 19 installer_object.install() |
| 20 env.register_installer(installer_object) | 20 env.register_installer(installer_object) |
| 21 except Exception, e: | 21 except Exception, e: |
| 22 # if the build/install fails, don't allow other tests | 22 # if the build/install fails, don't allow other tests |
| 23 # to get a installer. | 23 # to get a installer. |
| 24 msg = "KVM install failed: %s" % (e) | 24 msg = "KVM install failed: %s" % (e) |
| 25 env.register_installer(installer.FailedInstaller(msg)) | 25 env.register_installer(kvm_installer.FailedInstaller(msg)) |
| 26 raise | 26 raise |
| OLD | NEW |
|---|
Chromium Code Reviews
Issue 6883246:
Merge autotest upstream from @5318 ~ @5336 (Closed)
Base URL: ssh://gitrw.chromium.org:9222/autotest.git@master