Bug 1241644 - when using --spsProfile, do not upload data to graph server/perfherder; r?jmaher draft
authorRob Wood <rwood@mozilla.com>
Thu, 05 May 2016 15:45:46 -0400
changeset 381201 e072bfcd1d6bab6db34b85cb0e2cbca62ba43293
parent 380643 c9edfe35619f69f7785776ebd19a3140684024dc
child 381202 40b7fb16af10035424a4ca137e79e69e32d982a9
push id21425
push userrwood@mozilla.com
push dateFri, 24 Jun 2016 17:31:35 +0000
reviewersjmaher
bugs1241644
milestone50.0a1
Bug 1241644 - when using --spsProfile, do not upload data to graph server/perfherder; r?jmaher MozReview-Commit-ID: 2CHMB1qo9I1
testing/talos/talos/config.py
testing/talos/talos/run_tests.py
--- 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