diff options
| author | Xavier Morel <xmo@openerp.com> | 2012-11-15 10:15:01 +0100 |
|---|---|---|
| committer | Xavier Morel <xmo@openerp.com> | 2012-11-15 10:15:01 +0100 |
| commit | 8e85f4e0bd0b1fbbf401686b85d7282f8991454d (patch) | |
| tree | 62746b428bb574b40efc86d5692b24bb9709c068 /addons/web/controllers | |
| parent | 5fb303f12fe30c007ef462679039ca25205d64e7 (diff) | |
[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
Diffstat (limited to 'addons/web/controllers')
| -rw-r--r-- | addons/web/controllers/testing.py | 2 |
1 files changed, 1 insertions, 1 deletions
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"> |