Clean up extreme verbosity of logs in test harness.

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 unittest
 
 import cros_build_lib as cros_lib
 
 import au_worker
 
 
 class VMAUWorker(au_worker.AUWorker):
   """Test harness for updating virtual machines."""
 
   def __init__(self, options, test_results_root):
     """Processes vm-specific options."""
     au_worker.AUWorker.__init__(self, options, test_results_root)
     self.graphics_flag = ''
     if options.no_graphics: self.graphics_flag = '--no_graphics'
     if not self.board: cros_lib.Die('Need board to convert base image to vm.')
 
   def _KillExistingVM(self, pid_file):
     """Kills an existing VM specified by the pid_file."""
     if os.path.exists(pid_file):
-      cros_lib.Warning('Existing %s found.  Deleting and killing process' %
-                       pid_file)
       cros_lib.RunCommand(['./cros_stop_vm', '--kvm_pid=%s' % pid_file],
-                          cwd=self.crosutilsbin)
+                          cwd=self.crosutilsbin, print_cmd=False)
 
     assert not os.path.exists(pid_file)
 
   def CleanUp(self):
     """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)
@@ skipping 12 matching lines @@
            '--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.TestInfo(self.GetUpdateMessage(image_path, src_image_path, True,
+                                        proxy_port))
     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)
+    Info(self.GetUpdateMessage(image_path, src_image_path, True, proxy_port))

[dgarrett, 2011/04/18 23:32:52]

Should this be self.TestInfo instead?

     self.RunUpdateCmd(cmd, log_directory)
 
   def VerifyImage(self, unittest, percent_required_to_pass=100):
     """Runs vm smoke suite to verify image."""
     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 = ['./cros_run_vm_test',
                        '--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' % 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,
-                                 cwd=self.crosutilsbin)
+    self.TestInfo('Running smoke suite to verify image.')
+    output = cros_lib.RunCommand(
+        commandWithArgs, error_ok=True, enter_chroot=False,
+        redirect_stdout=True, redirect_stderr=True, cwd=self.crosutilsbin,
+        print_cmd=False, combine_stdout_stderr=True)
     return self.AssertEnoughTestsPassed(unittest, output,
                                         percent_required_to_pass)