From 581eb1e498d52b3bbfc8576dbd34a082756c6acc Mon Sep 17 00:00:00 2001 From: Armin Rigo Date: Tue, 28 Oct 2008 17:01:21 +0000 Subject: Fix one of the tests: it relied on being present in an "output test" in order to actually test what it was supposed to test, i.e. that the code in the __del__ method did not crash. Use instead the new helper test_support.captured_output(). --- Lib/test/test_descr.py | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) diff --git a/Lib/test/test_descr.py b/Lib/test/test_descr.py index f170d59..f740738 100644 --- a/Lib/test/test_descr.py +++ b/Lib/test/test_descr.py @@ -1136,14 +1136,10 @@ order (MRO) for bases """ def __del__(self_): self.assertEqual(self_.a, 1) self.assertEqual(self_.b, 2) - - save_stderr = sys.stderr - sys.stderr = sys.stdout - h = H() - try: + with test_support.captured_output('stderr') as s: + h = H() del h - finally: - sys.stderr = save_stderr + self.assertEqual(s.getvalue(), '') def test_slots_special(self): # Testing __dict__ and __weakref__ in __slots__... -- cgit v0.12