[Python-checkins] r80488 - in python/branches/release26-maint: Lib/test/test_httpservers.py
antoine.pitrou
python-checkins at python.org
Mon Apr 26 00:09:33 CEST 2010
Author: antoine.pitrou
Date: Mon Apr 26 00:09:32 2010
New Revision: 80488
Log:
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.
........
Modified:
python/branches/release26-maint/ (props changed)
python/branches/release26-maint/Lib/test/test_httpservers.py
Modified: python/branches/release26-maint/Lib/test/test_httpservers.py
==============================================================================
--- python/branches/release26-maint/Lib/test/test_httpservers.py (original)
+++ python/branches/release26-maint/Lib/test/test_httpservers.py Mon Apr 26 00:09:32 2010
@@ -32,14 +32,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()
@@ -49,13 +49,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={}):
More information about the Python-checkins
mailing list