Bug 1268622 - Talos should specify whether a run is e10s as a special property of the suite; r?jmaher
MozReview-Commit-ID: 44T9tDqxKzC
--- a/testing/talos/talos/output.py
+++ b/testing/talos/talos/output.py
@@ -170,16 +170,20 @@ class PerfherderOutput(Output):
# serialize test results
tsresult = None
if not test.using_xperf:
subtests = []
suite = {
'name': test.name(),
'subtests': subtests,
}
+
+ if self.results.extra_options:
+ suite['extraOptions'] = self.results.extra_options
+
suites.append(suite)
vals = []
replicates = {}
# TODO: counters!!!! we don't have any, but they suffer the
# same
for result in test.results:
# XXX this will not work for manifests which list
--- a/testing/talos/talos/results.py
+++ b/testing/talos/talos/results.py
@@ -16,20 +16,24 @@ import csv
from talos import output, utils, filter
class TalosResults(object):
"""Container class for Talos results"""
def __init__(self):
self.results = []
+ self.extra_options = []
def add(self, test_results):
self.results.append(test_results)
+ def add_extra_option(self, extra_option):
+ self.extra_options.append(extra_option)
+
def check_output_formats(self, output_formats):
"""check output formats"""
# ensure formats are available
formats = output_formats.keys()
missing = self.check_formats_exist(formats)
if missing:
raise utils.TalosError("Output format(s) unknown: %s"
--- a/testing/talos/talos/run_tests.py
+++ b/testing/talos/talos/run_tests.py
@@ -170,16 +170,20 @@ def run_tests(config, browser_config):
else:
# local mode, output to files
results_urls = dict(output_urls=[os.path.abspath('local.json')])
talos_results.check_output_formats(results_urls)
httpd = setup_webserver(browser_config['webserver'])
httpd.start()
+ # if e10s add as extra results option
+ if config['e10s']:
+ talos_results.add_extra_option('e10s')
+
testname = None
# run the tests
timer = utils.Timer()
LOG.suite_start(tests=[test['name'] for test in tests])
try:
for test in tests:
testname = test['name']
LOG.test_start(testname)