From dccc1fcfafd37c6fd94ca766516cb4903b29668e Mon Sep 17 00:00:00 2001 From: Benjamin Peterson Date: Mon, 22 Mar 2010 00:15:53 +0000 Subject: Merged revisions 79263 via svnmerge from svn+ssh://pythondev@svn.python.org/python/trunk ........ r79263 | michael.foord | 2010-03-21 19:06:30 -0500 (Sun, 21 Mar 2010) | 1 line Issue 7815. __unittest in module globals trims frames from reported stacktraces in unittest. ........ --- Lib/test/test_unittest.py | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'Lib/test/test_unittest.py') diff --git a/Lib/test/test_unittest.py b/Lib/test/test_unittest.py index b4716a41cc..954b40a38b 100644 --- a/Lib/test/test_unittest.py +++ b/Lib/test/test_unittest.py @@ -2096,6 +2096,16 @@ class Test_TestResult(TestCase): 'Tests getDescription() for a method with a longer ' 'docstring.')) + def testStackFrameTrimming(self): + class Frame(object): + class tb_frame(object): + f_globals = {} + result = unittest.TestResult() + self.assertFalse(result._is_relevant_tb_level(Frame)) + + Frame.tb_frame.f_globals['__unittest'] = True + self.assertTrue(result._is_relevant_tb_level(Frame)) + classDict = dict(unittest.TestResult.__dict__) for m in ('addSkip', 'addExpectedFailure', 'addUnexpectedSuccess', '__init__'): -- cgit v1.2.1