Merging from default

changeset:   3992:d3dc0aab0d61
parent:      3988:598059deb80a
user:        Dustin J. Mitchell <dustin@mozilla.com>
date:        Mon May 11 11:57:11 2015 -0400
summary:     Bug 1163653: fix grammar of 'Script was run'; r=mrrrgn

changeset:   3993:58c3cc6292b5
tag:         tip
user:        Chris Manchester <cmanchester@mozilla.com>
date:        Mon May 11 10:32:37 2015 -0700
summary:     Bug 1163247 - Check for an alternate property set by self-serve that may contain try syntax (selected tests). r=armenzg

--HG--
branch : production

mozharness/mozilla/building/buildbase.py

@@ -565,7 +565,7 @@ def _pre_config_lock(self, rw_config):
         build_pool_cfg = BuildOptionParser.build_pools.get(build_pool)
         branch_cfg = BuildOptionParser.branch_cfg_file
 
-        cfg_match_msg = "Script was ran with '%(option)s %(type)s' and \
+        cfg_match_msg = "Script was run with '%(option)s %(type)s' and \
 '%(type)s' matches a key in '%(type_config_file)s'. Updating self.config with \
 items from that key's value."
         pf_override_msg = "The branch '%(branch)s' has custom behavior for the \

mozharness/mozilla/testing/testbase.py

@@ -413,6 +413,10 @@ def _read_tree_config(self):
                                            'try_arguments.py')
             known_try_arguments = parse_config_file(try_config_path)
             comments = self.buildbot_config['sourcestamp']['changes'][-1]['comments']
+            if not comments and 'try_syntax' in self.buildbot_config['properties']:
+                # If we don't find try syntax in the usual place, check for it in an
+                # alternate property available to tools using self-serve.
+                comments = self.buildbot_config['properties']['try_syntax']
             self.parse_extra_try_arguments(comments, known_try_arguments)
 
         self.tree_config.lock()