Merge remote branch 'autotest-upstream/master' into merge-upstream

client/common_lib/test.py

 # Shell class for a test, inherited by all individual tests
 #
 # Methods:
 #       __init__        initialise
 #       initialize      run once for each job
 #       setup           run once for each new version of the test installed
 #       run             run the test (wrapped by job.run_test())
 #
 # Data:
 #       job             backreference to the job this test instance is part of
@@ skipping 182 matching lines @@
 
 
     def _call_run_once(self, constraints, profile_only,
                        postprocess_profiled_run, args, dargs):
         self.drop_caches_between_iterations()
 
         # execute iteration hooks
         for hook in self.before_iteration_hooks:
             hook(self)
 
-        if profile_only:
-            if not self.job.profilers.present():
-                self.job.record('WARN', None, None, 'No profilers have been '
-                                'added but profile_only is set - nothing '
-                                'will be run')
-            self.run_once_profiling(postprocess_profiled_run, *args, **dargs)
-        else:
-            self.before_run_once()
-            self.run_once(*args, **dargs)
-            self.after_run_once()
+        try:
+            if profile_only:
+                if not self.job.profilers.present():
+                    self.job.record('WARN', None, None,
+                                    'No profilers have been added but '
+                                    'profile_only is set - nothing '
+                                    'will be run')
+                self.run_once_profiling(postprocess_profiled_run,
+                                        *args, **dargs)
+            else:
+                self.before_run_once()
+                self.run_once(*args, **dargs)
+                self.after_run_once()
 
-        for hook in self.after_iteration_hooks:
-            hook(self)
-
-        self.postprocess_iteration()
-        self.analyze_perf_constraints(constraints)
+            self.postprocess_iteration()
+            self.analyze_perf_constraints(constraints)
+        finally:
+            for hook in self.after_iteration_hooks:
+                hook(self)
 
 
     def execute(self, iterations=None, test_length=None, profile_only=None,
                 _get_time=time.time, postprocess_profiled_run=None,
                 constraints=(), *args, **dargs):
         """
         This is the basic execute method for the tests inherited from base_test.
         If you want to implement a benchmark test, it's better to implement
         the run_once function, to cope with the profiling infrastructure. For
         other tests, you can just override the default implementation.
@@ skipping 457 matching lines @@
         if before_iteration_hook:
             mytest.register_before_iteration_hook(before_iteration_hook)
         if after_iteration_hook:
             mytest.register_after_iteration_hook(after_iteration_hook)
         mytest._exec(args, dargs)
     finally:
         os.chdir(pwd)
         if after_test_hook:
             after_test_hook(mytest)
         shutil.rmtree(mytest.tmpdir, ignore_errors=True)