From b912c5a004068e472b1b46fad68445e70934e280 Mon Sep 17 00:00:00 2001 From: R David Murray Date: Mon, 2 May 2011 08:47:24 -0400 Subject: [PATCH] I was right, hardconding the localhost IP doesn't work in linux-vserver. --- Lib/test/test_smtplib.py | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/Lib/test/test_smtplib.py b/Lib/test/test_smtplib.py index 4651f376f6e..884529f5427 100644 --- a/Lib/test/test_smtplib.py +++ b/Lib/test/test_smtplib.py @@ -290,8 +290,7 @@ class DebuggingServerTests(unittest.TestCase): self.serv_evt.wait() self.output.flush() # Add the X-Peer header that DebuggingServer adds - # XXX: I'm not sure hardcoding this IP will work on linux-vserver. - m['X-Peer'] = '127.0.0.1' + m['X-Peer'] = socket.gethostbyname('localhost') mexpect = '%s%s\n%s' % (MSG_BEGIN, m.as_string(), MSG_END) self.assertEqual(self.output.getvalue(), mexpect) @@ -311,8 +310,7 @@ class DebuggingServerTests(unittest.TestCase): self.serv_evt.wait() self.output.flush() # Add the X-Peer header that DebuggingServer adds - # XXX: I'm not sure hardcoding this IP will work on linux-vserver. - m['X-Peer'] = '127.0.0.1' + m['X-Peer'] = socket.gethostbyname('localhost') # The Bcc header is deleted before serialization. del m['Bcc'] 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.output.flush() # Add the X-Peer header that DebuggingServer adds - # XXX: I'm not sure hardcoding this IP will work on linux-vserver. - m['X-Peer'] = '127.0.0.1' + m['X-Peer'] = socket.gethostbyname('localhost') mexpect = '%s%s\n%s' % (MSG_BEGIN, m.as_string(), MSG_END) self.assertEqual(self.output.getvalue(), mexpect) debugout = smtpd.DEBUGSTREAM.getvalue()