[KVM-AUTOTEST PATCH 2/5] KVM test: kvm.py: make sure all dump_env() calls are inside 'finally' blocks

[Michael Goldish <mgoldish@xxxxxxxxxx>]

Signed-off-by: Michael Goldish <mgoldish@xxxxxxxxxx>
---
 client/tests/kvm/kvm.py |   29 +++++++++++++++++++----------
 1 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/client/tests/kvm/kvm.py b/client/tests/kvm/kvm.py
index 9b8a10c..c6e146d 100644
--- a/client/tests/kvm/kvm.py
+++ b/client/tests/kvm/kvm.py
@@ -21,6 +21,7 @@ class kvm(test.test):
             (Online doc - Getting started with KVM testing)
     """
     version = 1
+
     def run_once(self, params):
         # Report the parameters we've received and write them as keyvals
         logging.debug("Test parameters:")
@@ -33,7 +34,7 @@ class kvm(test.test):
         # Open the environment file
         env_filename = os.path.join(self.bindir, params.get("env", "env"))
         env = kvm_utils.load_env(env_filename, {})
-        logging.debug("Contents of environment: %s" % str(env))
+        logging.debug("Contents of environment: %s", str(env))
 
         try:
             try:
@@ -50,22 +51,30 @@ class kvm(test.test):
                 f.close()
 
                 # Preprocess
-                kvm_preprocessing.preprocess(self, params, env)
-                kvm_utils.dump_env(env, env_filename)
+                try:
+                    kvm_preprocessing.preprocess(self, params, env)
+                finally:
+                    kvm_utils.dump_env(env, env_filename)
                 # Run the test function
                 run_func = getattr(test_module, "run_%s" % t_type)
-                run_func(self, params, env)
-                kvm_utils.dump_env(env, env_filename)
+                try:
+                    run_func(self, params, env)
+                finally:
+                    kvm_utils.dump_env(env, env_filename)
 
             except Exception, e:
                 logging.error("Test failed: %s", e)
                 logging.debug("Postprocessing on error...")
-                kvm_preprocessing.postprocess_on_error(self, params, env)
-                kvm_utils.dump_env(env, env_filename)
+                try:
+                    kvm_preprocessing.postprocess_on_error(self, params, env)
+                finally:
+                    kvm_utils.dump_env(env, env_filename)
                 raise
 
         finally:
             # Postprocess
-            kvm_preprocessing.postprocess(self, params, env)
-            logging.debug("Contents of environment: %s", str(env))
-            kvm_utils.dump_env(env, env_filename)
+            try:
+                kvm_preprocessing.postprocess(self, params, env)
+            finally:
+                kvm_utils.dump_env(env, env_filename)
+                logging.debug("Contents of environment: %s", str(env))
-- 
1.5.4.1

--
To unsubscribe from this list: send the line "unsubscribe kvm" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html