[KVM-AUTOTEST,07/18] KVM test: kvm_preprocessing.py: simplify pre/post_command error handling

Commit Message

Michael Goldish June 18, 2010, 12:14 a.m. UTC

None

Patch

diff --git a/client/tests/kvm/kvm_preprocessing.py b/client/tests/kvm/kvm_preprocessing.py
index 84ad7c5..1ed4ec2 100644
--- a/client/tests/kvm/kvm_preprocessing.py
+++ b/client/tests/kvm/kvm_preprocessing.py
@@ -162,12 +162,10 @@  def process_command(test, params, env, command, command_timeout,
     try:
         utils.system("cd %s; %s" % (test.bindir, command))
     except error.CmdError, e:
-        logging.warn("Custom processing command '%s' failed, output is: %s",
-                     command, str(e))
-        if not command_noncritical:
-            raise error.TestError("Custom processing command failed: %s" %
-                                  str(e))
-
+        if command_noncritical:
+            logging.warn(e)
+        else:
+            raise
 
 def process(test, params, env, image_func, vm_func):
     """