Bug 1548845 - [raptor] Use a multiplier for page timeout when using live sites. r=perftest-reviewers,rwood
☠☠ backed out by f72947acdfcd ☠ ☠
authorHenrik Skupin <mail@hskupin.info>
Fri, 17 May 2019 11:12:02 +0000
changeset 533146 6b3a8394727fbde512c4ee39a4d8d21a17f10581
parent 533145 6d0bd72a59672bf12d7f0248644c7c708fb74d74
child 533147 152615db9db653c273b5e90487d198ae2fd788a5
push id11276
push userrgurzau@mozilla.com
push dateMon, 20 May 2019 13:11:24 +0000
treeherdermozilla-beta@847755a7c325 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersperftest-reviewers, rwood
bugs1548845
milestone68.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 1548845 - [raptor] Use a multiplier for page timeout when using live sites. r=perftest-reviewers,rwood Differential Revision: https://phabricator.services.mozilla.com/D30530
testing/raptor/raptor/manifest.py
--- a/testing/raptor/raptor/manifest.py
+++ b/testing/raptor/raptor/manifest.py
@@ -10,16 +10,18 @@ from manifestparser import TestManifest
 from mozlog import get_proxy_logger
 from utils import transform_platform
 
 here = os.path.abspath(os.path.dirname(__file__))
 raptor_ini = os.path.join(here, 'raptor.ini')
 tests_dir = os.path.join(here, 'tests')
 LOG = get_proxy_logger(component="raptor-manifest")
 
+LIVE_SITE_TIMEOUT_MULTIPLIER = 1.2
+
 required_settings = [
     'alert_threshold',
     'apps',
     'lower_is_better',
     'measure',
     'page_cycles',
     'test_url',
     'scenario_time',
@@ -322,18 +324,20 @@ def get_raptor_test_list(args, oskey):
         next_test['browser_cycle'] = 1
 
         if next_test.get('use_live_sites', "false") == "true":
             # when using live sites we want to turn off playback
             LOG.info("using live sites so turning playback off!")
             next_test['playback'] = None
             LOG.info("using live sites so appending '-live' to the test name")
             next_test['name'] = next_test['name'] + "-live"
-            # we also want to increase the page timeout since may be longer live
-            next_test['page_timeout'] = 180000
+            # allow a slightly higher page timeout due to remote page loads
+            next_test['page_timeout'] = int(
+                next_test['page_timeout']) * LIVE_SITE_TIMEOUT_MULTIPLIER
+            LOG.info("using live sites so using page timeout of %dms" % next_test['page_timeout'])
 
         # convert 'measure =' test INI line to list
         if next_test.get('measure') is not None:
             _measures = []
             for m in [m.strip() for m in next_test['measure'].split(',')]:
                 # build the 'measures =' list
                 _measures.append(m)
             next_test['measure'] = _measures