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

client/common_lib/test_unittest.py

 #!/usr/bin/python
 
 """Unit Tests for autotest.client.common_lib.test"""
 
 __author__ = 'gps@google.com (Gregory P. Smith)'
 
 import unittest
 from cStringIO import StringIO
 import common
 from autotest_lib.client.common_lib import error, test
@@ skipping 46 matching lines @@
         self.god.stub_function(self.test, 'analyze_perf_constraints')
         before_hook = self.god.create_mock_function('before_hook')
         after_hook = self.god.create_mock_function('after_hook')
         self.test.register_before_iteration_hook(before_hook)
         self.test.register_after_iteration_hook(after_hook)
 
         # tests the test._call_run_once implementation
         self.test.drop_caches_between_iterations.expect_call()
         before_hook.expect_call(self.test)
         self.test.run_once.expect_call(1, 2, arg='val')
-        after_hook.expect_call(self.test)
         self.test.postprocess_iteration.expect_call()
         self.test.analyze_perf_constraints.expect_call([])
+        after_hook.expect_call(self.test)
         self.test._call_run_once([], False, None, (1, 2), {'arg': 'val'})
         self.god.check_playback()
 
 
+    def test_call_run_once_with_exception(self):
+        # setup
+        self.god.stub_function(self.test, 'drop_caches_between_iterations')
+        self.god.stub_function(self.test, 'run_once')
+        before_hook = self.god.create_mock_function('before_hook')
+        after_hook = self.god.create_mock_function('after_hook')
+        self.test.register_before_iteration_hook(before_hook)
+        self.test.register_after_iteration_hook(after_hook)
+        error = Exception('fail')
+
+        # tests the test._call_run_once implementation
+        self.test.drop_caches_between_iterations.expect_call()
+        before_hook.expect_call(self.test)
+        self.test.run_once.expect_call(1, 2, arg='val').and_raises(error)
+        after_hook.expect_call(self.test)
+        try:
+            self.test._call_run_once([], False, None, (1, 2), {'arg': 'val'})
+        except:
+            pass
+        self.god.check_playback()
+
+
     def _expect_call_run_once(self):
         self.test._call_run_once.expect_call((), False, None, (), {})
 
 
     def test_execute_test_length(self):
         # test that test_length overrides iterations and works.
         self.god.stub_function(self.test, '_call_run_once')
 
         self._expect_call_run_once()
         self._expect_call_run_once()
@@ skipping 83 matching lines @@
         self.test.run_once_profiling.expect_call(True)
         self.test.postprocess.expect_call()
         self.test.process_failed_constraints.expect_call()
 
         self.test.execute(postprocess_profiled_run=True, iterations=1)
         self.god.check_playback()
 
 
 if __name__ == '__main__':
     unittest.main()