From efbf7632b86ee3e9f0ede32dc4d0786b38504cb7 Mon Sep 17 00:00:00 2001
From: Christophe Simonis <chs@openerp.com>
Date: Thu, 17 Apr 2014 19:06:20 +0200
Subject: [PATCH] [FIX] some tests need the http daemon to be available

bzr revid: chs@openerp.com-20140417170620-48tw5nj3jt43zxgk
---
 openerp/service/server.py | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

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.