# HG changeset patch # User Gregory Szorc # Date 2014-04-20 22:16:29 # Node ID 1517c0461b7572a3fbc3745c0023dac1c6b6dd4a # Parent 1b3a1ebdcfeea1fabe5c87e96bfc07a588b96c53 run-tests: move some functionality to Test.tearDown() diff --git a/tests/run-tests.py b/tests/run-tests.py --- a/tests/run-tests.py +++ b/tests/run-tests.py @@ -514,16 +514,6 @@ class Test(object): self._result = self.success() - vlog("# Ret was:", ret) - - # Don't print progress in unittest mode because that is handled - # by TestResult. - if not options.verbose and not self._unittest: - iolock.acquire() - sys.stdout.write(self._result[0]) - sys.stdout.flush() - iolock.release() - if not self._unittest: self.tearDown() @@ -531,6 +521,16 @@ class Test(object): def tearDown(self): """Tasks to perform after run().""" + vlog("# Ret was:", self._ret) + + # Don't print progress in unittest mode because that is handled + # by TestResult. + if not self._options.verbose and not self._unittest: + iolock.acquire() + sys.stdout.write(self._result[0]) + sys.stdout.flush() + iolock.release() + self._runner.times.append((self.name, self._duration)) def _run(self, testtmp, replacements, env):