[FIX] some tests need the http daemon to be available
authorChristophe Simonis <chs@openerp.com>
Thu, 17 Apr 2014 17:06:20 +0000 (19:06 +0200)
committerChristophe Simonis <chs@openerp.com>
Thu, 17 Apr 2014 17:06:20 +0000 (19:06 +0200)
bzr revid: chs@openerp.com-20140417170620-48tw5nj3jt43zxgk

openerp/service/server.py

index c182c10..9dde14c 100644 (file)
@@ -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.