Merged revisions 80487,80489 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/branches/py3k
................
r80487 | antoine.pitrou | 2010-04-26 00:01:43 +0200 (lun., 26 avril 2010) | 12 lines
Merged revisions 80484 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80484 | antoine.pitrou | 2010-04-25 23:40:32 +0200 (dim., 25 avril 2010) | 6 lines
Issue #2302: Fix a race condition in SocketServer.BaseServer.shutdown,
where the method could block indefinitely if called just before the
event loop started running. This also fixes the occasional freezes
witnessed in test_httpservers.
........
................
r80489 | antoine.pitrou | 2010-04-26 00:19:43 +0200 (lun., 26 avril 2010) | 9 lines
Merged revisions 80480 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r80480 | antoine.pitrou | 2010-04-25 23:15:50 +0200 (dim., 25 avril 2010) | 3 lines
Replace a Lock with a better suited Event.
........
................
diff --git a/Lib/test/test_httpservers.py b/Lib/test/test_httpservers.py
index 4653f4c..aa1e48c 100644
--- a/Lib/test/test_httpservers.py
+++ b/Lib/test/test_httpservers.py
@@ -34,14 +34,14 @@
threading.Thread.__init__(self)
self.request_handler = request_handler
self.test_object = test_object
- self.test_object.lock.acquire()
def run(self):
self.server = HTTPServer(('', 0), self.request_handler)
self.test_object.PORT = self.server.socket.getsockname()[1]
- self.test_object.lock.release()
+ self.test_object.server_started.set()
+ self.test_object = None
try:
- self.server.serve_forever()
+ self.server.serve_forever(0.05)
finally:
self.server.server_close()
@@ -51,13 +51,12 @@
class BaseTestCase(unittest.TestCase):
def setUp(self):
- self.lock = threading.Lock()
+ self.server_started = threading.Event()
self.thread = TestServerThread(self, self.request_handler)
self.thread.start()
- self.lock.acquire()
+ self.server_started.wait()
def tearDown(self):
- self.lock.release()
self.thread.stop()
def request(self, uri, method='GET', body=None, headers={}):
diff --git a/Lib/test/test_socketserver.py b/Lib/test/test_socketserver.py
index 43ce55c..0ab95d1 100644
--- a/Lib/test/test_socketserver.py
+++ b/Lib/test/test_socketserver.py
@@ -243,6 +243,30 @@
# socketserver.DatagramRequestHandler,
# self.dgram_examine)
+ def test_shutdown(self):
+ # Issue #2302: shutdown() should always succeed in making an
+ # other thread leave serve_forever().
+ class MyServer(socketserver.TCPServer):
+ pass
+
+ class MyHandler(socketserver.StreamRequestHandler):
+ pass
+
+ threads = []
+ for i in range(20):
+ s = MyServer((HOST, 0), MyHandler)
+ t = threading.Thread(
+ name='MyServer serving',
+ target=s.serve_forever,
+ kwargs={'poll_interval':0.01})
+ t.daemon = True # In case this function raises.
+ threads.append((t, s))
+ for t, s in threads:
+ t.start()
+ s.shutdown()
+ for t, s in threads:
+ t.join()
+
def test_main():
if imp.lock_held():