From: Antoine Pitrou <solipsis@pitrou.net>
Date: Sat, 12 Nov 2011 19:36:29 +0000 (+0100)
Subject: Restore smtpd.DEBUGSTREAM at the end of test_smtpd.
X-Git-Tag: v3.3.0a1~856
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=e0815e2db04c1b4d06163cbe4b0ea76119b41f96;p=python

Restore smtpd.DEBUGSTREAM at the end of test_smtpd.
This fixes a subsequent refleak in test_smtplib.
---

diff --git a/Lib/test/test_smtpd.py b/Lib/test/test_smtpd.py
index a4cd6707ba..68ccc29036 100644
--- a/Lib/test/test_smtpd.py
+++ b/Lib/test/test_smtpd.py
@@ -52,6 +52,7 @@ class SMTPDServerTest(TestCase):
 class SMTPDChannelTest(TestCase):
     def setUp(self):
         smtpd.socket = asyncore.socket = mock_socket
+        self.old_debugstream = smtpd.DEBUGSTREAM
         self.debug = smtpd.DEBUGSTREAM = io.StringIO()
         self.server = DummyServer('a', 'b')
         conn, addr = self.server.accept()
@@ -60,6 +61,7 @@ class SMTPDChannelTest(TestCase):
     def tearDown(self):
         asyncore.close_all()
         asyncore.socket = smtpd.socket = socket
+        smtpd.DEBUGSTREAM = self.old_debugstream
 
     def write_line(self, line):
         self.channel.socket.queue_recv(line)