Bug 1519863 - Ensure testharness.js accounts for the timeout multiplier, r=gsnedders
authorJames Graham <james@hoppipolla.co.uk>
Thu, 20 Dec 2018 15:53:42 +0000
changeset 515063 bc817b021d9dab8f134b494e88ba45e1082d0bb6
parent 515062 840a92f3e4d3c220924bf9ce27048c959c603a13
child 515064 0550f106669841c58e061e97551f395b578ecec3
push id1953
push userffxbld-merge
push dateMon, 11 Mar 2019 12:10:20 +0000
treeherdermozilla-release@9c35dcbaa899 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgsnedders
bugs1519863
milestone66.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1519863 - Ensure testharness.js accounts for the timeout multiplier, r=gsnedders Differential Revision: https://phabricator.services.mozilla.com/D16829
testing/web-platform/tests/resources/testharness.js
--- a/testing/web-platform/tests/resources/testharness.js
+++ b/testing/web-platform/tests/resources/testharness.js
@@ -2130,16 +2130,19 @@ policies and contribution forms [3].
                 } else if (p == "explicit_timeout" && value) {
                     this.timeout_length = null;
                     if (this.timeout_id)
                     {
                         clearTimeout(this.timeout_id);
                     }
                 } else if (p == "timeout_multiplier") {
                     this.timeout_multiplier = value;
+                    if (this.timeout_length) {
+                         this.timeout_length *= this.timeout_multiplier;
+                    }
                 }
             }
         }
 
         if (func) {
             try {
                 func();
             } catch (e) {