[Zope3-checkins] SVN: Zope3/branches/ZopeX3-3.0/src/zope/server/http/tests/test_httpserver.py Merge r29561 from ZopeX3-3.0.0-Zope-2.8 branch a.k.a r29928 from the trunk:

[Philipp von Weitershausen]

Log message for revision 37418:
  Merge r29561 from ZopeX3-3.0.0-Zope-2.8 branch a.k.a r29928 from the trunk:
  
  Log message for revision 29561:
    Fixed an import glitch.
  
  Log message for revision 29928:
    Fixed a function call thast caused many tests to fail with "-N 2"
  

Changed:
  U   Zope3/branches/ZopeX3-3.0/src/zope/server/http/tests/test_httpserver.py

-=-
Modified: Zope3/branches/ZopeX3-3.0/src/zope/server/http/tests/test_httpserver.py
===================================================================
--- Zope3/branches/ZopeX3-3.0/src/zope/server/http/tests/test_httpserver.py	2005-07-26 00:30:17 UTC (rev 37417)
+++ Zope3/branches/ZopeX3-3.0/src/zope/server/http/tests/test_httpserver.py	2005-07-26 00:34:12 UTC (rev 37418)
@@ -81,7 +81,7 @@
         if len(socket_map) != 1:
             # Let sockets die off.
             # XXX tests should be more careful to clear the socket map.
-            asyncore.poll(0.1)
+            poll(0.1)
         self.orig_map_size = len(socket_map)
         self.hook_asyncore_error()
         self.server = EchoHTTPServer(LOCALHOST, SERVER_PORT,