[pypy-svn] r72029 - pypy/release/1.2.x/lib-python/modified-2.5.2/test

[arigo at codespeak.net]

Author: arigo
Date: Wed Mar 10 11:17:06 2010
New Revision: 72029

Added:
   pypy/release/1.2.x/lib-python/modified-2.5.2/test/test_gc.py
      - copied unchanged from r72028, pypy/trunk/lib-python/modified-2.5.2/test/test_gc.py
Modified:
   pypy/release/1.2.x/lib-python/modified-2.5.2/test/test_urllib2_localnet.py
Log:
svn merge svn+ssh://codespeak.net/svn/pypy/trunk -r72026:72028


Modified: pypy/release/1.2.x/lib-python/modified-2.5.2/test/test_urllib2_localnet.py
==============================================================================
--- pypy/release/1.2.x/lib-python/modified-2.5.2/test/test_urllib2_localnet.py	(original)
+++ pypy/release/1.2.x/lib-python/modified-2.5.2/test/test_urllib2_localnet.py	Wed Mar 10 11:17:06 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()