mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-04 08:59:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

MERGE: Partial patch for issue #11812: Take care of test_telnetlib.py

Browse source
This commit is contained in:
Jesus Cea 2011-11-08 16:39:26 +01:00
commit 6e533f040b
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Lib/test/test_telnetlib.py
View file

@ -15,10 +15,9 @@ def server(evt, serv):
evt.set()
try:
conn, addr = serv.accept()
conn.close()
except socket.timeout:
pass
else:
conn.close()
finally:
serv.close()
@ -27,9 +26,10 @@ class GeneralTests(TestCase):
def setUp(self):
self.evt = threading.Event()
self.sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self.sock.settimeout(3)
self.sock.settimeout(60) # Safety net. Look issue 11812
self.port = support.bind_port(self.sock)
self.thread = threading.Thread(target=server, args=(self.evt,self.sock))
self.thread.setDaemon(True)
self.thread.start()
self.evt.wait()
@ -46,7 +46,7 @@ class GeneralTests(TestCase):
self.assertTrue(socket.getdefaulttimeout() is None)
socket.setdefaulttimeout(30)
try:
telnet = telnetlib.Telnet("localhost", self.port)
telnet = telnetlib.Telnet(HOST, self.port)
finally:
socket.setdefaulttimeout(None)
self.assertEqual(telnet.sock.gettimeout(), 30)
@ -64,13 +64,13 @@ class GeneralTests(TestCase):
telnet.sock.close()
def testTimeoutValue(self):
telnet = telnetlib.Telnet("localhost", self.port, timeout=30)
telnet = telnetlib.Telnet(HOST, self.port, timeout=30)
self.assertEqual(telnet.sock.gettimeout(), 30)
telnet.sock.close()
def testTimeoutOpen(self):
telnet = telnetlib.Telnet()
telnet.open("localhost", self.port, timeout=30)
telnet.open(HOST, self.port, timeout=30)
self.assertEqual(telnet.sock.gettimeout(), 30)
telnet.sock.close()