commit 445c896d9f750fb9f3a0956a379531b2c7c55e3b
author wychen@chromium.org <wychen@chromium.org> Tue Apr 28 23:30:05 2015 +0000
committer wychen@chromium.org <wychen@chromium.org> Tue Apr 28 23:30:05 2015 +0000
tree a3fb85943ffbe5a4199e8c5d5d2c6f51667829bd
parent 7676cca756766dec5798ee6201014c47807bbb80

Fix mock restoration in git_cl_test

The assertion in TestGitCl.tearDown should be done after super.tearDown
is finished. Otherwise if the assertion fails, mocked objects won't be
restored properly, and the next TestCase would be affected.

Review URL: https://codereview.chromium.org/1093943002

git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@295049 0039d316-1c4b-4281-b951-d872f2087c98

tests/git_cl_test.py

diff --git a/tests/git_cl_test.py b/tests/git_cl_test.py
index ed1d7a5..c1eebeb 100755
--- a/tests/git_cl_test.py
+++ b/tests/git_cl_test.py
@@ -100,9 +100,11 @@
     git_cl.settings = None
 
   def tearDown(self):
-    if not self.has_failed():
-      self.assertEquals([], self.calls)
-    super(TestGitCl, self).tearDown()
+    try:
+      if not self.has_failed():
+        self.assertEquals([], self.calls)
+    finally:
+      super(TestGitCl, self).tearDown()
 
   def _mocked_call(self, *args, **_kwargs):
     self.assertTrue(