Commit c49ac301 authored by Jérome Perrin's avatar Jérome Perrin Committed by Kazuhiko Shiozaki

test: remove unused createZServer

parent 45136517
...@@ -17,7 +17,7 @@ from zLOG import LOG, ERROR ...@@ -17,7 +17,7 @@ from zLOG import LOG, ERROR
from Products.CMFActivity.Activity.Queue import VALIDATION_ERROR_DELAY from Products.CMFActivity.Activity.Queue import VALIDATION_ERROR_DELAY
from ExtensionClass import pmc_init_of from ExtensionClass import pmc_init_of
from Products.ERP5Type.tests.utils import \ from Products.ERP5Type.tests.utils import \
addUserToDeveloperRole, createZServer, DummyMailHostMixin, parseListeningAddress addUserToDeveloperRole, DummyMailHostMixin, parseListeningAddress
from Products.CMFActivity.ActivityTool import getCurrentNode from Products.CMFActivity.ActivityTool import getCurrentNode
......
...@@ -384,30 +384,6 @@ def parseListeningAddress(host_port=None, default_host='127.0.0.1'): ...@@ -384,30 +384,6 @@ def parseListeningAddress(host_port=None, default_host='127.0.0.1'):
raise RuntimeError("Can't find free port (tried ports %u to %u)\n" raise RuntimeError("Can't find free port (tried ports %u to %u)\n"
% (55000, 54999 + m)) % (55000, 54999 + m))
def createZServer(log=os.devnull, zserver_type='http'):
import ZServer
if zserver_type == 'http':
zserver_class, zhandler_class = ZServer.zhttp_server, ZServer.zhttp_handler
elif zserver_type == 'webdav':
from ZServer.HTTPServer import zwebdav_server as zserver_class
from ZServer.WebDAVSrcHandler import WebDAVSrcHandler as zhandler_class
else:
raise NotImplementedError
lg = ZServer.logger.file_logger(log)
class new_zserver(zserver_class):
# I can't use __new__ because zhttp_handler is an old-style class :(
def __init__(self):
self.__class__, = self.__class__.__bases__
for ip, port in parseListeningAddress(os.environ.get('zserver')):
hs = new_zserver()
try:
hs.__init__(ip, port, resolver=None, logger_object=lg)
hs.install_handler(zhandler_class(module='Zope2', uri_base=''))
return hs
except socket.error as e:
if e[0] != errno.EADDRINUSE:
raise
hs.close()
class DbFactory(ZopeDatabase): class DbFactory(ZopeDatabase):
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment