summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristophe Simonis <chs@openerp.com>2014-04-17 19:06:20 +0200
committerChristophe Simonis <chs@openerp.com>2014-04-17 19:06:20 +0200
commitefbf7632b86ee3e9f0ede32dc4d0786b38504cb7 (patch)
treee2460b132ee41b04c19a9f7b033063ce663f932e
parent2024cc28b2dd2b8c1385bc82784c34981e9718b3 (diff)
[FIX] some tests need the http daemon to be available
bzr revid: chs@openerp.com-20140417170620-48tw5nj3jt43zxgk
-rw-r--r--openerp/service/server.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/openerp/service/server.py b/openerp/service/server.py
index c182c10a74d..9dde14c0edb 100644
--- a/openerp/service/server.py
+++ b/openerp/service/server.py
@@ -292,10 +292,14 @@ class ThreadedServer(CommonServer):
import win32api
win32api.SetConsoleCtrlHandler(lambda sig: self.signal_handler(sig, None), 1)
+ test_mode = config['test_enable'] or config['test_file']
+ if not stop or test_mode:
+ # some tests need the http deamon to be available...
+ self.http_spawn()
+
if not stop:
# only relevant if we are not in "--stop-after-init" mode
self.cron_spawn()
- self.http_spawn()
def stop(self):
""" Shutdown the WSGI server. Wait for non deamon threads.