Mirror
/
cpython
mirror of https://github.com/python/cpython
4
1
Fork 0
Code Issues Releases Wiki Activity

Merge: I was right, hardconding the localhost IP doesn't work in linux-vserver.

This commit is contained in:
R David Murray 2011-05-02 08:48:00 -04:00
parent 2265cf4c2e b912c5a004
commit 477a6eb4a2
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Lib/test/test_smtplib.py
View File

@ -290,8 +290,7 @@ class DebuggingServerTests(unittest.TestCase):
self.serv_evt.wait() self.serv_evt.wait()
self.output.flush() self.output.flush()
# Add the X-Peer header that DebuggingServer adds # Add the X-Peer header that DebuggingServer adds
# XXX: I'm not sure hardcoding this IP will work on linux-vserver. m['X-Peer'] = socket.gethostbyname('localhost')
m['X-Peer'] = '127.0.0.1'
mexpect = '%s%s\n%s' % (MSG_BEGIN, m.as_string(), MSG_END) mexpect = '%s%s\n%s' % (MSG_BEGIN, m.as_string(), MSG_END)
self.assertEqual(self.output.getvalue(), mexpect) self.assertEqual(self.output.getvalue(), mexpect)
@ -311,8 +310,7 @@ class DebuggingServerTests(unittest.TestCase):
self.serv_evt.wait() self.serv_evt.wait()
self.output.flush() self.output.flush()
# Add the X-Peer header that DebuggingServer adds # Add the X-Peer header that DebuggingServer adds
# XXX: I'm not sure hardcoding this IP will work on linux-vserver. m['X-Peer'] = socket.gethostbyname('localhost')
m['X-Peer'] = '127.0.0.1'
# The Bcc header is deleted before serialization. # The Bcc header is deleted before serialization.
del m['Bcc'] del m['Bcc']
mexpect = '%s%s\n%s' % (MSG_BEGIN, m.as_string(), MSG_END) mexpect = '%s%s\n%s' % (MSG_BEGIN, m.as_string(), MSG_END)
@ -341,8 +339,7 @@ class DebuggingServerTests(unittest.TestCase):
self.serv_evt.wait() self.serv_evt.wait()
self.output.flush() self.output.flush()
# Add the X-Peer header that DebuggingServer adds # Add the X-Peer header that DebuggingServer adds
# XXX: I'm not sure hardcoding this IP will work on linux-vserver. m['X-Peer'] = socket.gethostbyname('localhost')
m['X-Peer'] = '127.0.0.1'
mexpect = '%s%s\n%s' % (MSG_BEGIN, m.as_string(), MSG_END) mexpect = '%s%s\n%s' % (MSG_BEGIN, m.as_string(), MSG_END)
self.assertEqual(self.output.getvalue(), mexpect) self.assertEqual(self.output.getvalue(), mexpect)
debugout = smtpd.DEBUGSTREAM.getvalue() debugout = smtpd.DEBUGSTREAM.getvalue()