--- a/mozilla-tests/config.py
+++ b/mozilla-tests/config.py
@@ -461,17 +461,17 @@ MOCHITEST_BC_7_E10S = [
### Mochitests (Browser-Chrome-Screenshots) ###
MOCHITEST_BC_SCREENSHOTS = [
('mochitest-browser-screenshots', {
'use_mozharness': True,
'script_path': 'scripts/desktop_unittest.py',
'extra_args': ['--mochitest-suite', 'browser-chrome-screenshots'],
'blob_upload': True,
- 'script_maxtime': 600,
+ 'script_maxtime': 1200,
}),
]
### Mochitests (Devtools) ###
MOCHITEST_DT_2 = [
('mochitest-devtools-chrome', {
'use_mozharness': True,
'script_path': 'scripts/desktop_unittest.py',
@@ -872,16 +872,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/linux_unittest.py"],
},
'mochitest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'mochitest-browser-chrome': {
'config_files': ["unittests/linux_unittest.py"],
},
+ 'mochitest-browser-screenshots': {
+ 'config_files': ["unittests/linux_unittest.py"],
+ },
'mochitest-e10s-browser-chrome': {
'config_files': ["unittests/linux_unittest.py"],
},
'mochitest-other': {
'config_files': ["unittests/linux_unittest.py"],
},
'mochitest-devtools-chrome': {
'config_files': ["unittests/linux_unittest.py"],
@@ -980,16 +983,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/linux_unittest.py"],
},
'mochitest-e10s': {
'config_files': ["unittests/linux_unittest.py"],
},
'mochitest-browser-chrome': {
'config_files': ["unittests/linux_unittest.py"],
},
+ 'mochitest-browser-screenshots': {
+ 'config_files': ["unittests/linux_unittest.py"],
+ },
'mochitest-e10s-browser-chrome': {
'config_files': ["unittests/linux_unittest.py"],
},
'mochitest-other': {
'config_files': ["unittests/linux_unittest.py"],
},
'mochitest-devtools-chrome': {
'config_files': ["unittests/linux_unittest.py"],
@@ -1427,16 +1433,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-csb': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-browser-chrome': {
'config_files': ["unittests/win_unittest.py"],
},
+ 'mochitest-browser-screenshots': {
+ 'config_files': ["unittests/win_unittest.py"],
+ },
'mochitest-other': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-devtools-chrome': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-e10s-devtools-chrome': {
'config_files': ["unittests/win_unittest.py"],
@@ -1526,16 +1535,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-csb': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-browser-chrome': {
'config_files': ["unittests/win_unittest.py"],
},
+ 'mochitest-browser-screenshots': {
+ 'config_files': ["unittests/win_unittest.py"],
+ },
'mochitest-e10s-browser-chrome': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-other': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-devtools-chrome': {
'config_files': ["unittests/win_unittest.py"],
@@ -1631,16 +1643,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-csb': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-browser-chrome': {
'config_files': ["unittests/win_unittest.py"],
},
+ 'mochitest-browser-screenshots': {
+ 'config_files': ["unittests/win_unittest.py"],
+ },
'mochitest-e10s-browser-chrome': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-other': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-devtools-chrome': {
'config_files': ["unittests/win_unittest.py"],
@@ -1747,16 +1762,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-csb': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-browser-chrome': {
'config_files': ["unittests/win_unittest.py"],
},
+ 'mochitest-browser-screenshots': {
+ 'config_files': ["unittests/win_unittest.py"],
+ },
'mochitest-e10s-browser-chrome': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-other': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-devtools-chrome': {
'config_files': ["unittests/win_unittest.py"],
@@ -1846,16 +1864,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-csb': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-browser-chrome': {
'config_files': ["unittests/win_unittest.py"],
},
+ 'mochitest-browser-screenshots': {
+ 'config_files': ["unittests/win_unittest.py"],
+ },
'mochitest-e10s-browser-chrome': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-other': {
'config_files': ["unittests/win_unittest.py"],
},
'mochitest-devtools-chrome': {
'config_files': ["unittests/win_unittest.py"],
@@ -1948,16 +1969,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/mac_unittest.py"],
},
'mochitest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'mochitest-browser-chrome': {
'config_files': ["unittests/mac_unittest.py"],
},
+ 'mochitest-browser-screenshots': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
'mochitest-e10s-browser-chrome': {
'config_files': ["unittests/mac_unittest.py"],
},
'mochitest-other': {
'config_files': ["unittests/mac_unittest.py"],
},
'mochitest-devtools-chrome': {
'config_files': ["unittests/mac_unittest.py"],
@@ -2042,16 +2066,19 @@ PLATFORM_UNITTEST_VARS = {
'config_files': ["unittests/mac_unittest.py"],
},
'mochitest-e10s': {
'config_files': ["unittests/mac_unittest.py"],
},
'mochitest-browser-chrome': {
'config_files': ["unittests/mac_unittest.py"],
},
+ 'mochitest-browser-screenshots': {
+ 'config_files': ["unittests/mac_unittest.py"],
+ },
'mochitest-e10s-browser-chrome': {
'config_files': ["unittests/mac_unittest.py"],
},
'mochitest-other': {
'config_files': ["unittests/mac_unittest.py"],
},
'mochitest-devtools-chrome': {
'config_files': ["unittests/mac_unittest.py"],
@@ -2664,16 +2691,31 @@ for slave_platform in ('ubuntu64_vm', 'u
if slave_platform in BRANCHES[branch]['platforms'][platform]:
if platform == 'linux64':
BRANCHES[branch]['platforms'][platform][slave_platform]['debug_unittest_suites'] = [item for item in BRANCHES[branch]['platforms'][platform][slave_platform]['debug_unittest_suites'] if item not in MEDIATESTS]
elif platform == 'linux64-asan':
BRANCHES[branch]['platforms'][platform][slave_platform]['opt_unittest_suites'] = [item for item in BRANCHES[branch]['platforms'][platform][slave_platform]['opt_unittest_suites'] if item not in MEDIATESTS]
BRANCHES[branch]['platforms'][platform][slave_platform]['debug_unittest_suites'] = [item for item in BRANCHES[branch]['platforms'][platform][slave_platform]['debug_unittest_suites'] if item not in MEDIATESTS]
+# Enable browser chrome screenshots on try and m-c
+for branch_name in ('try', 'mozilla-central'):
+ branch = BRANCHES[branch_name]
+ for platform in PLATFORMS.keys():
+ if platform not in branch['platforms']:
+ continue
+ if platform == 'linux64-asan':
+ continue
+ for slave_platform in PLATFORMS[platform]['slave_platforms']:
+ if slave_platform in ('ubuntu64_vm', 'ubuntu64-asan_vm'):
+ continue
+ if slave_platform in branch['platforms'][platform]:
+ branch['platforms'][platform][slave_platform]['opt_unittest_suites'] += MOCHITEST_BC_SCREENSHOTS
+
+
### Test suites that only run on Cedar ###
# Turn off most suites on cedar (bug 1198400)
for platform in PLATFORMS.keys():
if platform not in BRANCHES['cedar']['platforms']:
continue
for slave_platform in PLATFORMS[platform]['slave_platforms']:
if slave_platform in BRANCHES['cedar']['platforms'][platform]:
BRANCHES['cedar']['platforms'][platform][slave_platform]['opt_unittest_suites'] = []
@@ -2714,18 +2756,16 @@ for platform in PLATFORMS.keys():
delete_slave_platform(BRANCHES, PLATFORMS, {'win64': 'win10_64'}, branch_exclusions=["try"])
# Enable web-platform-tests-e10s on windows 7 try opt
BRANCHES['try']['platforms']['win32']['win7-ix']['opt_unittest_suites'] += WEB_PLATFORM_REFTESTS_E10S
BRANCHES['try']['platforms']['win32']['win7-ix']['opt_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED_E10S
BRANCHES['try']['platforms']['win32']['win7-all']['opt_unittest_suites'] += WEB_PLATFORM_REFTESTS_E10S
BRANCHES['try']['platforms']['win32']['win7-all']['opt_unittest_suites'] += WEB_PLATFORM_TESTS_CHUNKED_E10S
-# Enable browser chrome screenshots on yosemite try opt
-BRANCHES['try']['platforms']['macosx64']['yosemite_r7']['opt_unittest_suites'] += MOCHITEST_BC_SCREENSHOTS
ride_trains_branches = []
for name, branch in items_at_least(BRANCHES, 'gecko_version', 45):
ride_trains_branches.append(name)
r7_active_branches = []
for name, branch in items_at_least(BRANCHES, 'gecko_version', 43):
r7_active_branches.append(name)