Bug 1131269 - use SETA data to disable unneeded tests r=catlee
authorkmoir@mozilla.com
Fri, 10 Apr 2015 16:23:46 -0400 (2015-04-10)
changeset 4184 afbcf8c86304e66c713fb711d299863eb894dd88
parent 4181 2ad242b35b83beb3a897e99d44d4a939f26aa5c7
child 4185 43f28d2027009dac5e55922c33529271e47d77ad
push id3488
push userkmoir@mozilla.com
push dateFri, 10 Apr 2015 20:24:35 +0000 (2015-04-10)
reviewerscatlee
bugs1131269
Bug 1131269 - use SETA data to disable unneeded tests r=catlee
misc.py
--- a/misc.py
+++ b/misc.py
@@ -2731,16 +2731,17 @@ def generateTalosBranchObjects(branch, b
                                 for test in test_builders:
                                     skipcount = 0
                                     skiptimeout = 0
                                     if branch_config['platforms'][platform][slave_platform].get('skipconfig'):
                                         #extract last word in the test string as it should correspond to the name of the test
                                         test_name = test.split()[-1]
                                         if (test_type, test_name) in branch_config['platforms'][platform][slave_platform]['skipconfig']:
                                             skipcount, skiptimeout = branch_config['platforms'][platform][slave_platform]['skipconfig'][test_type, test_name]
+                                            builderMergeLimits[test] = skipcount
                                     suites_by_skipconfig[skipcount, skiptimeout].append(test)
 
                                 # Create a new Scheduler for every skip config
                                 for (skipcount, skiptimeout), test_builders in suites_by_skipconfig.items():
                                     scheduler_class = Scheduler
                                     s_name = scheduler_name
                                     extra_args = {}