nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1658448 - tweaks to windows unittest setup to support running on hardware. r=markco

Browse source 
tweaks to windows unittest setup to support running on hardware.

Differential Revision: https://phabricator.services.mozilla.com/D86637
This commit is contained in:
Joel Maher 2020-08-11 18:45:09 +00:00
parent d32163703e
commit c3f53eef4d
2 changed files with 12 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

12
testing/mozharness/configs/unittests/win_unittest.py
View file

@ -34,7 +34,7 @@ config = {
"installer_path": INSTALLER_PATH, "installer_path": INSTALLER_PATH,
"binary_path": BINARY_PATH, "binary_path": BINARY_PATH,
"xpcshell_name": XPCSHELL_NAME, "xpcshell_name": XPCSHELL_NAME,
"virtualenv_modules": ['pypiwin32'], "virtualenv_modules": ['pypiwin32', 'six==1.13.0', 'vcversioner==2.16.0.0'],
"virtualenv_path": 'venv', "virtualenv_path": 'venv',
"exe_suffix": EXE_SUFFIX, "exe_suffix": EXE_SUFFIX,
@ -267,6 +267,16 @@ config = {
'halt_on_failure': True, 'halt_on_failure': True,
'enabled': True 'enabled': True
}, },
{
'name': 'prepare chrome profile',
'cmd': [
'powershell', '-command',
'if (test-path ${env:ProgramFiles(x86)}\Google\Chrome\Application\chrome.exe) {start chrome; Start-Sleep -s 30; taskkill /F /IM chrome.exe /T}'
],
'architectures': ['32bit', '64bit'],
'halt_on_failure': True,
'enabled': True
},
], ],
"vcs_output_timeout": 1000, "vcs_output_timeout": 1000,
"minidump_save_path": "%(abs_work_dir)s/../minidumps", "minidump_save_path": "%(abs_work_dir)s/../minidumps",

2
testing/tools/websocketprocessbridge/websocketprocessbridge_requirements.txt
View file

@ -1,6 +1,6 @@
# needed by txws, and we'd like pip to get it from the local server before setuptools tries pypi # needed by txws, and we'd like pip to get it from the local server before setuptools tries pypi
six six
vcversioner==2.16.0.0
twisted==10.2.0 twisted==10.2.0
# websocket adapter for twisted, might be built into twisted someday # websocket adapter for twisted, might be built into twisted someday