Backed out changeset 030cb27161ee (bug 1538786) for raptor failures in testing/raptor/test/test_manifest.py::test_get_raptor_test_list_firefox CLOSED TREE
authorshindli <shindli@mozilla.com>
Tue, 26 Mar 2019 04:52:51 +0200
changeset 466035 24f40f4b59ac622c10ee88eeb72f9772cb046fe0
parent 466034 67cc4d399e8a5080c55ba428942e61613b6ba44b
child 466036 c4304f249404645305030419bccb391c173e239d
push id35758
push userrgurzau@mozilla.com
push dateTue, 26 Mar 2019 09:51:47 +0000
treeherdermozilla-central@4572f6055a6a [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
bugs1538786
milestone68.0a1
backs out030cb27161ee4539c9e0d220e8a3f1812459cccd
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
Backed out changeset 030cb27161ee (bug 1538786) for raptor failures in testing/raptor/test/test_manifest.py::test_get_raptor_test_list_firefox CLOSED TREE
testing/raptor/raptor/manifest.py
testing/raptor/raptor/output.py
--- a/testing/raptor/raptor/manifest.py
+++ b/testing/raptor/raptor/manifest.py
@@ -243,20 +243,16 @@ def get_raptor_test_list(args, oskey):
         else:
             if int(next_test.get('page_cycles', 1)) > max_page_cycles:
                 next_test['page_cycles'] = max_page_cycles
                 LOG.info("page-cycles set to %d" % next_test['page_cycles'])
         # if --page-timeout was provided on the command line, use that instead of INI
         if args.page_timeout is not None:
             LOG.info("setting page-timeout to %d as specified on cmd line" % args.page_timeout)
             next_test['page_timeout'] = args.page_timeout
-        # if --browser-cycles was provided on the command line, use that instead of INI
-        if args.browser_cycles is not None:
-            LOG.info("setting browser-cycles to %d as specified on cmd line" % args.browser_cycles)
-            next_test['browser_cycles'] = args.browser_cycles
 
         if next_test.get("cold", "false") == "true":
             # when running in cold mode, set browser-cycles to the page-cycles value; as we want
             # the browser to restart between page-cycles; and set page-cycles to 1 as we only
             # want 1 single page-load for every browser-cycle
             next_test['cold'] = True
             next_test['expected_browser_cycles'] = int(next_test['browser_cycles'])
             next_test['page_cycles'] = 1
--- a/testing/raptor/raptor/output.py
+++ b/testing/raptor/raptor/output.py
@@ -199,29 +199,24 @@ class Output(object):
                 {'name': u'ttfi', 'lowerIsBetter': True, 'alertThreshold': 2.0, 'value': 3084,
                 'replicates': [3084], 'unit': u'ms'}, {'name': u'loadtime', 'lowerIsBetter': True,
                 'alertThreshold': 2.0, 'value': 605, 'shouldAlert': True, 'replicates': [605],
                 'unit': u'ms'}],
             'cold': True, 'type': u'pageload', 'unit': u'ms'}]
 
         Need to combine those into a single entry.
         '''
-        # check if we actually have any results
-        if len(self.results) == 0:
-            LOG.info("error: no raptor test results found, so no need to combine browser cycles")
-            return
-
         # first build a list of entries that need to be combined; and as we do that, mark the
         # original suite entry as up for deletion, so once combined we know which ones to del
         # note that summarized results are for all tests that were ran in the session, which
         # could include cold and / or warm page-load and / or benchnarks combined
         suites_to_be_combined = []
         combined_suites = []
 
-        for _index, suite in enumerate(self.summarized_results.get('suites', [])):
+        for _index, suite in enumerate(self.summarized_results['suites']):
             if suite.get('cold') is None:
                 continue
 
             if suite['expected_browser_cycles'] > 1:
                 _name = suite['name']
                 _details = suite.copy()
                 suites_to_be_combined.append({'name': _name, 'details': _details})
                 suite['to_be_deleted'] = True