Chromium Code Reviews| Index: au_test_harness/vm_au_worker.py |
| diff --git a/au_test_harness/vm_au_worker.py b/au_test_harness/vm_au_worker.py |
| index f64515e64542db8731c4fbc0ed44caa43edf05fc..5c2e46213ece49a64d095dbe1f8d3bb579488b70 100644 |
| --- a/au_test_harness/vm_au_worker.py |
| +++ b/au_test_harness/vm_au_worker.py |
| @@ -25,10 +25,8 @@ class VMAUWorker(au_worker.AUWorker): |
| 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) |
| @@ -61,6 +59,8 @@ class VMAUWorker(au_worker.AUWorker): |
| ] |
| self.AppendUpdateFlags(cmd, image_path, src_image_path, proxy_port, |
| private_key_path) |
| + cros_lib.Info(self.GetUpdateMessage(image_path, src_image_path, True, |
| + proxy_port)) |
| self.RunUpdateCmd(cmd, log_directory) |
| def UpdateUsingPayload(self, update_path, stateful_change='old', |
| @@ -80,6 +80,7 @@ class VMAUWorker(au_worker.AUWorker): |
| stateful_change_flag, |
| ] |
| if proxy_port: cmd.append('--proxy_port=%s' % proxy_port) |
| + Info(self.GetUpdateMessage(image_path, src_image_path, True, proxy_port)) |
| self.RunUpdateCmd(cmd, log_directory) |
| def VerifyImage(self, unittest, percent_required_to_pass=100): |
| @@ -98,9 +99,11 @@ class VMAUWorker(au_worker.AUWorker): |
| 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) |
| + cros_lib.Info('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, |
|
davidjames
2011/04/15 17:52:09
Two comments:
1. Looks like stderr is getting redi
sosa
2011/04/18 21:12:44
Not sure. stderr is pretty useless here unless th
|
| + print_cmd=False) |
| return self.AssertEnoughTestsPassed(unittest, output, |
| percent_required_to_pass) |