From 8e85f4e0bd0b1fbbf401686b85d7282f8991454d Mon Sep 17 00:00:00 2001
From: Xavier Morel <xmo@openerp.com>
Date: Thu, 15 Nov 2012 10:15:01 +0100
Subject: [IMP] timeout discipline

* Global timeout significantly increased to correctly handle e.g. db creation and teardown
* Per-test timeout brought back down to 2s

bzr revid: xmo@openerp.com-20121115091501-ys8opo0ccr3dq29h
---
 addons/web/controllers/testing.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'addons/web/controllers/testing.py')

diff --git a/addons/web/controllers/testing.py b/addons/web/controllers/testing.py
index 95121f5b192..3c7c4899b6c 100644
--- a/addons/web/controllers/testing.py
+++ b/addons/web/controllers/testing.py
@@ -54,7 +54,7 @@ TESTING = Template(u"""<!DOCTYPE html>
         var oe_db_info = ${db_info};
         // List of modules, each module is preceded by its dependencies
         var oe_all_dependencies = ${dependencies};
-        QUnit.config.testTimeout = 10000;
+        QUnit.config.testTimeout = 5 * 60 * 1000;
     </script>
 </head>
 <body id="oe" class="openerp">
-- 
cgit v1.2.3