summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIvan Yelizariev <yelizariev@it-projects.info>2018-03-14 06:31:55 -0400
committerged-odoo <ged@odoo.com>2018-03-14 11:31:55 +0100
commit9fc44bef8331bd6c1a2bac0c9a0c1aa1c7ae2e2a (patch)
tree85b53c7f17d036abbc740ab5600e17903d02cd90
parent4252cd705366c5b9364526122041f2544fbfbbbe (diff)
[IMP] web_tour: specify timeout per step
RUNNING_TOUR_TIMEOUT is equal to 10 seconds, which sometimes is not enough on travis and we need a way to increase timeout per step. Note: Exact same commit was already merged for version 11.0 here: 67e2372 Note 2: this is technically a IMP, not a fix, but I (GED) will accept this, since this should only impact the testing functionality. Also, this was done in 11.0, so in some sense, it was proved to work. (PR: #21750)
-rw-r--r--addons/web_tour/static/src/js/tour_manager.js2
1 files changed, 1 insertions, 1 deletions
diff --git a/addons/web_tour/static/src/js/tour_manager.js b/addons/web_tour/static/src/js/tour_manager.js
index ba7adfc5443..654efc01a76 100644
--- a/addons/web_tour/static/src/js/tour_manager.js
+++ b/addons/web_tour/static/src/js/tour_manager.js
@@ -457,7 +457,7 @@ return core.Class.extend({
this._stop_running_tour_timeout();
this.running_tour_timeout = setTimeout((function() {
this._consume_tour(tour_name, _.str.sprintf("Tour %s failed at step %s", tour_name, step.trigger));
- }).bind(this), RUNNING_TOUR_TIMEOUT + this.running_step_delay);
+ }).bind(this), (step.timeout || RUNNING_TOUR_TIMEOUT) + this.running_step_delay);
},
_stop_running_tour_timeout: function () {
clearTimeout(this.running_tour_timeout);