From: R David Murray <rdmurray@bitdance.com>
Date: Mon, 4 Jun 2012 19:55:51 +0000 (-0400)
Subject: #8739: fix omission of DEBUGSTREAM reset in new test in test_smtpd.
X-Git-Tag: v3.3.0b1~280
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=05cab75d5908948a4607494a8bfc5b85a735c713;p=python

#8739: fix omission of DEBUGSTREAM reset in new test in test_smtpd.

This clears up an error in detected by refleak mode that showed up when
test_smtplib was run after test_smtpd in the same refleak run.
---

diff --git a/Lib/test/test_smtpd.py b/Lib/test/test_smtpd.py
index dda194139c..93f14c4562 100644
--- a/Lib/test/test_smtpd.py
+++ b/Lib/test/test_smtpd.py
@@ -507,6 +507,7 @@ class SMTPDChannelWithDataSizeLimitTest(unittest.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()
@@ -516,6 +517,7 @@ class SMTPDChannelWithDataSizeLimitTest(unittest.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)