diff -r 5e18ff5476e8 -r b93657b239a5 Lib/test/test_telnetlib.py
--- a/Lib/test/test_telnetlib.py	Mon Nov 07 16:30:01 2011 -0600
+++ b/Lib/test/test_telnetlib.py	Tue Nov 08 15:18:51 2011 +0100
@@ -15,29 +15,25 @@
 evt.set()
 try:
 conn, addr = serv.accept()
+ conn.close()
 except socket.timeout:
 pass
- else:
- conn.close()
 finally:
 serv.close()
- evt.set()
 
 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()
- self.evt.clear()
- time.sleep(.1)
 
 def tearDown(self):
- self.evt.wait()
 self.thread.join()
 del self.thread # Clear out any dangling Thread objects.
 
@@ -50,7 +46,7 @@
 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)
@@ -68,13 +64,13 @@
 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()
 
</div><div class="naked_ctrl">
<form action="/index.cgi/contrast" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://bugs.python.org/file23632/b93657b239a5.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://bugs.python.org/file23632/b93657b239a5.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast" selected="selected">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>