Bug 1541215 - [raptor] Fall back to 1 browser_cycle / page_cycle if test doesn't specify a value. r=rwood
authorHenrik Skupin <mail@hskupin.info>
Thu, 04 Apr 2019 06:12:38 +0000
changeset 526725 4b426a0865626537c0d59f78d651c934adc750b9
parent 526724 a247a37c1e9b6d2277bb6f6466321b26734f6714
child 526726 bf54318fe559218e7ffa139a9ad0cf3c3869bf43
push id11265
push userffxbld-merge
push dateMon, 13 May 2019 10:53:39 +0000
treeherdermozilla-beta@77e0fe8dbdd3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrwood
bugs1541215
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 1541215 - [raptor] Fall back to 1 browser_cycle / page_cycle if test doesn't specify a value. r=rwood Differential Revision: https://phabricator.services.mozilla.com/D25854
testing/raptor/raptor/raptor.py
--- a/testing/raptor/raptor/raptor.py
+++ b/testing/raptor/raptor/raptor.py
@@ -127,17 +127,17 @@ class Raptor(object):
 
         gen_test_config(self.config['app'],
                         test['name'],
                         self.control_server.port,
                         self.post_startup_delay,
                         host=self.config['host'],
                         b_port=self.benchmark_port,
                         debug_mode=1 if self.debug_mode else 0,
-                        browser_cycle=test['browser_cycle'])
+                        browser_cycle=test.get('browser_cycle', 1))
 
         self.install_raptor_webext()
 
         if test.get("preferences", None) is not None:
             self.set_browser_test_prefs(test['preferences'])
 
         # if 'alert_on' was provided in the test INI, add to our config for results/output
         self.config['subtest_alert_on'] = test.get('alert_on', None)
@@ -318,17 +318,17 @@ class Raptor(object):
             self.log.critical("Profiling ignored because MOZ_UPLOAD_DIR was not set")
         else:
             self.gecko_profiler = GeckoProfile(upload_dir,
                                                self.config,
                                                test)
 
     def wait_for_test_finish(self, test, timeout):
         # convert timeout to seconds and account for page cycles
-        timeout = int(timeout / 1000) * int(test['page_cycles'])
+        timeout = int(timeout / 1000) * int(test.get('page_cycles', 1))
         # account for the pause the raptor webext runner takes after browser startup
         timeout += (int(self.post_startup_delay / 1000) + 3)
 
         # if geckoProfile enabled, give browser more time for profiling
         if self.config['gecko_profile'] is True:
             timeout += 5 * 60
 
         elapsed_time = 0