Merged trunk r73189:73190 into 2.9 branch.

Protect against setNumberOfThreads disappearing after first use.

lib/python/Testing/ZopeTestCase/threadutils.py

@@ -22,6 +22,15 @@ from StringIO import StringIO
 dummyLOG = StringIO()
 
 
+def setNumberOfThreads(number_of_threads):
+    '''Sets number of ZServer threads.'''
+    try:
+        from ZServer.PubCore import setNumberOfThreads
+        setNumberOfThreads(number_of_threads)
+    except ImportError:
+        pass
+
+
 def zserverRunner(host, port, log=None):
     '''Runs an HTTP ZServer on host:port.'''
     from ZServer import logger, asyncore

lib/python/Testing/ZopeTestCase/utils.py

@@ -115,7 +115,7 @@ def startZServer(number_of_threads=1, log=None):
     if _Z2HOST is None:
         _Z2HOST = '127.0.0.1'
         _Z2PORT = random.choice(range(55000, 55500))
-        from ZServer import setNumberOfThreads
+        from threadutils import setNumberOfThreads
         setNumberOfThreads(number_of_threads)
         from threadutils import QuietThread, zserverRunner
         t = QuietThread(target=zserverRunner, args=(_Z2HOST, _Z2PORT, log))