Add logs for update_engine and image_to_live to test artifacts.

bin/au_test_harness/vm_au_worker.py

 # Copyright (c) 2011 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 """Module containing implementation of an au_worker for virtual machines."""
 
 import os
 import threading
 import unittest
 
@@ skipping 40 matching lines @@
     """Stop the vm after a test."""
     self._KillExistingVM(self._kvm_pid_file)
 
   def PrepareBase(self, image_path):
     """Creates an update-able VM based on base image."""
     self.PrepareVMBase(image_path)
 
   def UpdateImage(self, image_path, src_image_path='', stateful_change='old',
                   proxy_port='', private_key_path=None):
     """Updates VM image with image_path."""
+    log_directory = self.GetNextResultsPath('update')
     stateful_change_flag = self.GetStatefulChangeFlag(stateful_change)
     if src_image_path and self._first_update:
       src_image_path = self.vm_image_path
       self._first_update = False
 
     cmd = ['%s/cros_run_vm_update' % self.crosutilsbin,
            '--vm_image_path=%s' % self.vm_image_path,
+           '--update_log=%s' % os.path.join(log_directory, 'update_engine.log'),
            '--snapshot',
            self.graphics_flag,
            '--persist',
            '--kvm_pid=%s' % self._kvm_pid_file,
            '--ssh_port=%s' % self._ssh_port,
            stateful_change_flag,
           ]
     self.AppendUpdateFlags(cmd, image_path, src_image_path, proxy_port,
                            private_key_path)
-    self.RunUpdateCmd(cmd)
+    self.RunUpdateCmd(cmd, log_directory)
 
   def UpdateUsingPayload(self, update_path, stateful_change='old',
                          proxy_port=None):
     """Updates a vm image using cros_run_vm_update."""
+    log_directory = self.GetNextResultsPath('update')
     stateful_change_flag = self.GetStatefulChangeFlag(stateful_change)
     cmd = ['%s/cros_run_vm_update' % self.crosutilsbin,
            '--payload=%s' % update_path,
            '--vm_image_path=%s' % self.vm_image_path,
+           '--update_log=%s' % os.path.join(log_directory, 'update_engine.log'),
            '--snapshot',
            self.graphics_flag,
            '--persist',
            '--kvm_pid=%s' % self._kvm_pid_file,
            '--ssh_port=%s' % self._ssh_port,
            stateful_change_flag,
            ]
     if proxy_port: cmd.append('--proxy_port=%s' % proxy_port)
-    self.RunUpdateCmd(cmd)
+    self.RunUpdateCmd(cmd, log_directory)
 
   def VerifyImage(self, unittest, percent_required_to_pass=100):
     """Runs vm smoke suite to verify image."""
-    test_directory = self.GetNextResultsPath('verify')
+    log_directory = self.GetNextResultsPath('verify')
+    (_, _, log_directory_in_chroot) = log_directory.rpartition('chroot')
     # image_to_live already verifies lsb-release matching.  This is just
     # for additional steps.
     commandWithArgs = ['%s/cros_run_vm_test' % self.crosutilsbin,
                        '--image_path=%s' % self.vm_image_path,
                        '--snapshot',
                        '--persist',
                        '--kvm_pid=%s' % self._kvm_pid_file,
                        '--ssh_port=%s' % self._ssh_port,
-                       '--results_dir_root=%s' % test_directory,
+                       '--results_dir_root=%s' % log_directory_in_chroot,
                        self.verify_suite,
                       ]
     if self.graphics_flag: commandWithArgs.append(self.graphics_flag)
     output = cros_lib.RunCommand(commandWithArgs, error_ok=True,
                                  enter_chroot=False, redirect_stdout=True)
     return self.AssertEnoughTestsPassed(unittest, output,
                                         percent_required_to_pass)