Commit c54d0766 authored by Arnaud Fontaine's avatar Arnaud Fontaine

zope4: ZServer removal: Remove old code starting ZServer.

parent e7d5852e
...@@ -156,7 +156,7 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase): ...@@ -156,7 +156,7 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase):
from Products.ERP5Type.tests.runUnitTest import log_directory from Products.ERP5Type.tests.runUnitTest import log_directory
log = os.path.join(log_directory, "Z2.log") log = os.path.join(log_directory, "Z2.log")
message = "Running %s server at %s:%s\n" message = "Running %s server at %s:%s\n"
if int(os.environ.get('erp5_wsgi', 0)): if True:
from Products.ERP5.bin.zopewsgi import app_wrapper, createServer from Products.ERP5.bin.zopewsgi import app_wrapper, createServer
sockets = [] sockets = []
server_type = 'HTTP' server_type = 'HTTP'
...@@ -198,23 +198,6 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase): ...@@ -198,23 +198,6 @@ class ProcessingNodeTestCase(ZopeTestCase.TestCase):
t = Thread(target=hs.run) t = Thread(target=hs.run)
t.setDaemon(1) t.setDaemon(1)
t.start() t.start()
else:
_print = lambda hs: verbose and ZopeTestCase._print(
message % (hs.server_protocol, hs.server_name, hs.server_port))
try:
hs = createZServer(log)
except RuntimeError as e:
ZopeTestCase._print(str(e))
else:
ProcessingNodeTestCase._server_address = hs.server_name, hs.server_port
_print(hs)
try:
_print(createZServer(log, zserver_type='webdav'))
except RuntimeError as e:
ZopeTestCase._print('Could not start webdav zserver: %s\n' % e)
t = Thread(target=Lifetime.loop)
t.setDaemon(1)
t.start()
from Products.CMFActivity import ActivityTool from Products.CMFActivity import ActivityTool
# Reset, in case that getServerAddress was already called, # Reset, in case that getServerAddress was already called,
# in which case, the value was ('', '') # in which case, the value was ('', '')
......
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