зеркало из https://github.com/mozilla/iris.git
'minor_changes
This commit is contained in:
Родитель
8ee6e7ab56
Коммит
f437ef5f00
1
Pipfile
1
Pipfile
|
@ -26,6 +26,7 @@ mss = "==4.0.1"
|
|||
pytest = "*"
|
||||
pygithub = "*"
|
||||
bugzilla = "*"
|
||||
psutil = "*"
|
||||
funcy = "==1.11"
|
||||
# Platform dependencies
|
||||
xlib = {platform_system = "== 'Linux'",version = "==0.21"}
|
||||
|
|
|
@ -107,8 +107,8 @@ class Target(BaseTarget):
|
|||
def pytest_runtest_setup(self, item):
|
||||
BaseTarget.pytest_runtest_setup(self, item)
|
||||
|
||||
# if not OSHelper.is_linux() or not OSHelper.is_windows ():
|
||||
# mouse_reset()
|
||||
if OSHelper.is_mac():
|
||||
mouse_reset()
|
||||
if item.name == 'test_run':
|
||||
skip_reason_list = []
|
||||
values = item.own_markers[0].kwargs
|
||||
|
|
|
@ -270,11 +270,10 @@ class FXRunner:
|
|||
from targets.firefox.firefox_ui.helpers.keyboard_shortcuts import quit_firefox
|
||||
|
||||
if OSHelper.is_windows():
|
||||
logger.info('Closing firefox instance')
|
||||
quit_firefox()
|
||||
if FXRunner.process.pid is not None:
|
||||
try:
|
||||
logger.info('Closing firefox processId %s' % FXRunner.process.pid)
|
||||
logger.debug('Closing firefox processId %s' % FXRunner.process.pid)
|
||||
process = psutil.Process(FXRunner.process.pid)
|
||||
for proc in process.children(recursive=True):
|
||||
proc.kill()
|
||||
|
|
Загрузка…
Ссылка в новой задаче