Bug 1557741: Use fetches for tests that need geckodriver. r=jgraham

Differential Revision: https://phabricator.services.mozilla.com/D74645
This commit is contained in:
Chris AtLee 2020-05-13 21:13:51 +00:00
Родитель 723ecc70b6
Коммит 51984d5c6c
7 изменённых файлов: 66 добавлений и 10 удалений

Просмотреть файл

@ -189,6 +189,34 @@ web-platform-tests-wdspec:
linux.*64-asan/opt: 2
.*-qr/.*: 2 # can't be tier-1 if it's not running on integration branches
default: default
fetches:
toolchain:
by-test-platform:
linux.*64.*:
- linux64-geckodriver
- linux64-minidump-stackwalk
- linux64-fix-stacks
linux.*32.*:
- linux32-geckodriver
- linux64-minidump-stackwalk
- linux64-fix-stacks
macosx.*:
- macosx64-geckodriver
- macosx64-minidump-stackwalk
- macosx64-fix-stacks
win.*-32.*:
- win32-geckodriver
- win32-minidump-stackwalk
- win32-fix-stacks
win.*-64.*:
- win64-geckodriver
- win32-minidump-stackwalk
- win32-fix-stacks
default:
- linux64-minidump-stackwalk
- linux64-fix-stacks
- linux64-geckodriver
web-platform-tests-wdspec-headless:
description: "Web platform webdriver-spec headless run"
@ -210,6 +238,33 @@ web-platform-tests-wdspec-headless:
- --test-type=wdspec
- --setpref=toolkit.asyncshutdown.log=true
- --headless
fetches:
toolchain:
by-test-platform:
linux.*64.*:
- linux64-geckodriver
- linux64-minidump-stackwalk
- linux64-fix-stacks
linux.*32.*:
- linux32-geckodriver
- linux64-minidump-stackwalk
- linux64-fix-stacks
macosx.*:
- macosx64-geckodriver
- macosx64-minidump-stackwalk
- macosx64-fix-stacks
win.*-32.*:
- win32-geckodriver
- win32-minidump-stackwalk
- win32-fix-stacks
win.*-64.*:
- win64-geckodriver
- win32-minidump-stackwalk
- win32-fix-stacks
default:
- linux64-minidump-stackwalk
- linux64-fix-stacks
- linux64-geckodriver
web-platform-tests-crashtest:
description: "Web platform crashtests run"

Просмотреть файл

@ -21,8 +21,7 @@ config = {
"--certutil-binary=%(test_install_path)s/bin/certutil",
],
# this would normally be in "exes", but "exes" is clobbered by remove_executables
"geckodriver": os.path.join("%(abs_test_bin_dir)s", "geckodriver"),
"geckodriver": os.path.join("%(abs_fetches_dir)s", "geckodriver"),
"per_test_category": "web-platform",

Просмотреть файл

@ -17,7 +17,7 @@ config = {
],
"avds_dir": "/builds/worker/workspace/build/.android",
"binary_path": "/tmp",
"geckodriver": "%(abs_test_bin_dir)s/geckodriver",
"geckodriver": "%(abs_fetches_dir)s/geckodriver",
"hostutils_manifest_path": "testing/config/tooltool-manifests/linux64/hostutils.manifest",
"log_tbpl_level": "info",
"log_raw_level": "info",

Просмотреть файл

@ -21,8 +21,7 @@ config = {
"--certutil-binary=%(test_install_path)s/bin/certutil",
],
# this would normally be in "exes", but "exes" is clobbered by remove_executables
"geckodriver": os.path.join("%(abs_test_bin_dir)s", "geckodriver"),
"geckodriver": os.path.join("%(abs_fetches_dir)s", "geckodriver"),
"per_test_category": "web-platform",

Просмотреть файл

@ -30,9 +30,7 @@ config = {
'hg': 'c:/mozilla-build/hg/hg',
},
# this would normally be in "exes", but "exes" is clobbered by remove_executables
"geckodriver": os.path.join("%(abs_test_bin_dir)s", "geckodriver.exe"),
"geckodriver": os.path.join("%(abs_fetches_dir)s", "geckodriver.exe"),
"per_test_category": "web-platform",

Просмотреть файл

@ -105,8 +105,7 @@ config = {
},
],
# this would normally be in "exes", but "exes" is clobbered by remove_executables
"geckodriver": os.path.join("%(abs_test_bin_dir)s", "geckodriver.exe"),
"geckodriver": os.path.join("%(abs_fetches_dir)s", "geckodriver.exe"),
"per_test_category": "web-platform",
}

Просмотреть файл

@ -648,3 +648,9 @@ Did you run with --create-virtualenv? Is mozinstall in virtualenv_modules?""")
c = self.config
if c.get('run_cmd_checks_enabled'):
self._run_cmd_checks(c.get('postflight_run_cmd_suites', []))
def query_abs_dirs(self):
abs_dirs = super(TestingMixin, self).query_abs_dirs()
if 'MOZ_FETCHES_DIR' in os.environ:
abs_dirs['abs_fetches_dir'] = os.environ['MOZ_FETCHES_DIR']
return abs_dirs