[pypy-svn] r72027 - pypy/trunk/lib-python/modified-2.5.2/test

[arigo at codespeak.net]

Author: arigo
Date: Wed Mar 10 10:42:58 2010
New Revision: 72027

Modified:
   pypy/trunk/lib-python/modified-2.5.2/test/test_urllib2_localnet.py
Log:
Add a timeout instead of hanging forever if the server
could not start (e.g. port already in use).


Modified: pypy/trunk/lib-python/modified-2.5.2/test/test_urllib2_localnet.py
==============================================================================
--- pypy/trunk/lib-python/modified-2.5.2/test/test_urllib2_localnet.py	(original)
+++ pypy/trunk/lib-python/modified-2.5.2/test/test_urllib2_localnet.py	Wed Mar 10 10:42:58 2010
@@ -240,7 +240,9 @@
 
         self.server = LoopbackHttpServerThread(self.PORT, FakeProxyHandler)
         self.server.start()
-        self.server.ready.wait()
+        self.server.ready.wait(10)
+        if not self.server.ready.isSet():
+            raise Exception("timeout waiting for the server to be ready")
 
         handler = urllib2.ProxyHandler({"http" : self.PROXY_URL})
         self._digest_auth_handler = urllib2.ProxyDigestAuthHandler()