Merge backout
authorJustin Wood <Callek@gmail.com>
Tue, 10 Mar 2015 17:12:03 -0400 (2015-03-10)
changeset 11965 e512064a2a244809952413c1dab55c76306738f7
parent 11963 73605107199068523928b189e2814e9a7f2bb037 (current diff)
parent 11964 3cfd40a2cc7eeaae45da4430e47c8e7928caaa35 (diff)
child 11968 1909d3951d0269ee851a8036e9ecd2b4b4fa8765
push id8678
push userCallek@gmail.com
push dateTue, 10 Mar 2015 21:12:10 +0000 (2015-03-10)
Merge backout
--- a/mozilla-tests/thunderbird_config.py
+++ b/mozilla-tests/thunderbird_config.py
@@ -131,31 +131,25 @@ XPCSHELL = [
         'use_mozharness': True,
         'script_path': 'scripts/desktop_unittest.py',
         'extra_args': ['--xpcshell-suite', 'xpcshell',
                        '--cfg', 'unittests/thunderbird_extra.py'],
         'blob_upload': True,
         'script_maxtime': 7200,
     }),
 ]
-MOZMILL = [
-    ('mozmill', {
-        'use_mozharness': True,
-        'script_path': 'scripts/desktop_unittest.py',
-        'extra_args': ['--mozmill-suite', 'mozmill',
-                       '--cfg', 'unittests/thunderbird_extra.py'],
-        'blob_upload': True,
-        'script_maxtime': 7200,
-    }),
-]
 
 # Default set of unit tests
 UNITTEST_SUITES = {
-    'opt_unittest_suites': MOZMILL + XPCSHELL,
-    'debug_unittest_suites': MOZMILL + XPCSHELL,
+    'opt_unittest_suites': [
+        ('mozmill', ['mozmill']),
+    ] + XPCSHELL,
+    'debug_unittest_suites': [
+        ('mozmill', ['mozmill']),
+    ] + XPCSHELL,
 }
 # You must define opt_unittest_suites when enable_opt_unittests is True for a
 # platform. Likewise debug_unittest_suites for enable_debug_unittests
 PLATFORM_UNITTEST_VARS = {
     'linux': {
         'product_name': 'thunderbird',
         'app_name': 'mail',
         'brand_name': 'Daily',
@@ -387,38 +381,16 @@ for platform in PLATFORMS.keys():
                         # wasn't in the list anyways
                         pass
 
 # Mac OSX signing changes in gecko 34 - bug 1117637, bug 1047584
 for name, branch in items_before(BRANCHES, 'gecko_version', 34):
   if 'macosx64' in BRANCHES[name]['platforms']:
     BRANCHES[name]['platforms']['macosx64']['mac_res_subdir'] = 'MacOS'
 
-# mozmill-on-mozharness should ride the trains
-# Replace old trains with non-mozharness code.
-# MERGE DAY (remove this code once Thunderbird no longer services Gecko 38 and lower)
-for platform in PLATFORMS.keys():
-    MOZMILL_OLD = ('mozmill', ['mozmill'])
-    for name, branch in items_before(BRANCHES, 'gecko_version', 39):
-        if platform not in branch['platforms']:
-            continue
-        for slave_platform in PLATFORMS[platform]['slave_platforms']:
-            if slave_platform not in branch['platforms'][platform]:
-                continue
-
-            for suite_type in ['opt_unittest_suites', 'debug_unittest_suites']:
-                for mozmill in MOZMILL:
-                    try:
-                        branch['platforms'][platform][slave_platform][suite_type].remove(xpcshell)
-                        if MOZMILL_OLD not in branch['platforms'][platform][slave_platform][suite_type]:
-                            branch['platforms'][platform][slave_platform][suite_type].append(MOZMILL_OLD)
-                    except ValueError:
-                        # wasn't in the list anyways
-                        pass
-
 if __name__ == "__main__":
     import sys
     import pprint
 
     args = sys.argv[1:]
 
     if len(args) > 0:
         items = dict([(b, BRANCHES[b]) for b in args])