mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-08-30 21:48:47 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 7

Merged revisions 80487,80489 via svnmerge from

Browse source 
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.
  ........
................
This commit is contained in:
Antoine Pitrou 2010-04-25 22:26:08 +00:00
parent d5781076eb
commit e312391529
4 changed files with 48 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

11
Lib/test/test_httpservers.py
View file

@ -34,14 +34,14 @@ class TestServerThread(threading.Thread):
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 TestServerThread(threading.Thread):
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={}):