Bug 1241644 - when using --spsProfile, do not upload data to graph server/perfherder; r?jmaher
MozReview-Commit-ID: 2CHMB1qo9I1
--- a/testing/talos/talos/config.py
+++ b/testing/talos/talos/config.py
@@ -306,19 +306,21 @@ def get_active_tests(config):
activeTests = [i for i in activeTests if i != 'damp']
return activeTests
def get_global_overrides(config):
global_overrides = {}
for key in GLOBAL_OVERRIDES:
# get global overrides for all tests
- value = config.pop(key)
+ value = config[key]
if value is not None:
global_overrides[key] = value
+ if key != 'sps_profile':
+ config.pop(key)
# add noChrome to global overrides (HACK)
noChrome = config.pop('noChrome')
if noChrome:
global_overrides['tpchrome'] = False
# HACK: currently xperf tests post results to graph server and
# we want to ensure we don't publish shutdown numbers
--- a/testing/talos/talos/run_tests.py
+++ b/testing/talos/talos/run_tests.py
@@ -156,17 +156,17 @@ def run_tests(config, browser_config):
date = int(time.time())
LOG.debug("using testdate: %d" % date)
LOG.debug("actual date: %d" % int(time.time()))
# results container
talos_results = TalosResults()
# results links
- if not browser_config['develop']:
+ if not browser_config['develop'] and not config['sps_profile']:
results_urls = dict(
# another hack; datazilla stands for Perfherder
# and do not require url, but a non empty dict is required...
output_urls=['local.json'],
)
else:
# local mode, output to files
results_urls = dict(output_urls=[os.path.abspath('local.json')])
@@ -212,17 +212,17 @@ def run_tests(config, browser_config):
LOG.suite_end()
httpd.stop()
LOG.info("Completed test suite (%s)" % timer.elapsed())
# output results
if results_urls:
talos_results.output(results_urls)
- if browser_config['develop']:
+ if browser_config['develop'] or config['sps_profile']:
print ("Thanks for running Talos locally. Results are in %s"
% (results_urls['output_urls']))
# we will stop running tests on a failed test, or we will return 0 for
# green
return 0