summaryrefslogtreecommitdiff
path: root/addons/web/tests
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2017-09-06 13:29:05 +0200
committerChristophe Simonis <chs@odoo.com>2017-09-06 13:29:05 +0200
commitb8dd34fcbb895b8d62f3e133dcf5ee6f40a1400d (patch)
tree196c99a14d51d88a2f81f12be98fb8ff2c4359f7 /addons/web/tests
parent16541ae2ae953195f1bd0036e474aac0014aee4b (diff)
parent64d56995e049d7e7bc3aa7af5a16603220b0d4bc (diff)
[MERGE] forward port branch saas-16 up to 64d56995e04
Diffstat (limited to 'addons/web/tests')
-rw-r--r--addons/web/tests/test_js.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web/tests/test_js.py b/addons/web/tests/test_js.py
index c2f29ba0d0d..1614be64c43 100644
--- a/addons/web/tests/test_js.py
+++ b/addons/web/tests/test_js.py
@@ -10,4 +10,4 @@ class WebSuite(odoo.tests.HttpCase):
at_install = False
def test_01_js(self):
- self.phantom_js('/web/tests?mod=web', "", "", login='admin', timeout=240)
+ self.phantom_js('/web/tests?mod=web', "", "", login='admin', timeout=300)