Merge remote branch 'autotest-upstream/master' into merge-upstream

client/tests/kvm/test_setup.py

 """
 Library to perform pre/post test setup for KVM autotest.
 """
 import os, shutil, tempfile, re, ConfigParser, glob, inspect
 import logging, time
 from autotest_lib.client.common_lib import error
 from autotest_lib.client.bin import utils
 
 
 @error.context_aware
@@ skipping 50 matching lines @@
     """
     def __init__(self):
         self.path = None
 
 
     def setup_answer_file(self, filename, contents):
         utils.open_write_close(os.path.join(self.mount, filename), contents)
 
 
     def copy_to(self, src):
+        logging.debug("Copying %s to disk image mount", src)
         dst = os.path.join(self.mount, os.path.basename(src))
         if os.path.isdir(src):
             shutil.copytree(src, dst)
         elif os.path.isfile(src):
             shutil.copyfile(src, dst)
 
 
     def close(self):
         os.chmod(self.path, 0755)
         cleanup(self.mount)
@@ skipping 139 matching lines @@
         """
         root_dir = test.bindir
         images_dir = os.path.join(root_dir, 'images')
         self.deps_dir = os.path.join(root_dir, 'deps')
         self.unattended_dir = os.path.join(root_dir, 'unattended')
 
         attributes = ['kernel_args', 'finish_program', 'cdrom_cd1',
                       'unattended_file', 'medium', 'url', 'kernel', 'initrd',
                       'nfs_server', 'nfs_dir', 'install_virtio', 'floppy',
                       'cdrom_unattended', 'boot_path', 'extra_params',
-                      'qemu_img_binary', 'cdkey', 'virtio_storage_path',
-                      'virtio_network_path', 'virtio_network_installer_path']
+                      'qemu_img_binary', 'cdkey', 'finish_program']
 
         for a in attributes:
             setattr(self, a, params.get(a, ''))
 
         if self.install_virtio == 'yes':
             v_attributes = ['virtio_floppy', 'virtio_storage_path',
                             'virtio_network_path', 'virtio_oemsetup_id',
                             'virtio_network_installer']
             for va in v_attributes:
                 setattr(self, va, params.get(va, ''))
 
         self.tmpdir = test.tmpdir
 
         if getattr(self, 'unattended_file'):
             self.unattended_file = os.path.join(root_dir, self.unattended_file)
 
+        if getattr(self, 'finish_program'):
+            self.finish_program = os.path.join(root_dir, self.finish_program)
+
         if getattr(self, 'qemu_img_binary'):
             if not os.path.isfile(getattr(self, 'qemu_img_binary')):
                 self.qemu_img_binary = os.path.join(root_dir,
                                                     self.qemu_img_binary)
 
         if getattr(self, 'cdrom_cd1'):
             self.cdrom_cd1 = os.path.join(root_dir, self.cdrom_cd1)
         self.cdrom_cd1_mount = tempfile.mkdtemp(prefix='cdrom_cd1_',
                                                 dir=self.tmpdir)
         if self.medium == 'nfs':
@@ skipping 430 matching lines @@
         l_result = utils.run('losetup -a')
         if self.loopback and (self.loopback in l_result.stdout):
             try:
                 utils.run("losetup -d %s" % self.loopback)
             except error.CmdError:
                 logging.error("Failed to liberate loopback %s", self.loopback)
         if os.path.islink(self.qcow_file_path):
             os.remove(self.qcow_file_path)
         if os.path.isfile(self.raw_file_path):
             os.remove(self.raw_file_path)