From f437ef5f00c54b72146fc50c15a4bb0dd4af97db Mon Sep 17 00:00:00 2001 From: Andrei Filip Date: Thu, 2 May 2019 11:10:22 +0300 Subject: [PATCH] 'minor_changes --- Pipfile | 1 + targets/firefox/app.py | 4 ++-- targets/firefox/firefox_app/fx_browser.py | 3 +-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Pipfile b/Pipfile index d27eef98..bbd37032 100644 --- a/Pipfile +++ b/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"} diff --git a/targets/firefox/app.py b/targets/firefox/app.py index 24da537b..96dfaf9e 100644 --- a/targets/firefox/app.py +++ b/targets/firefox/app.py @@ -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 diff --git a/targets/firefox/firefox_app/fx_browser.py b/targets/firefox/firefox_app/fx_browser.py index 6763d8e1..6cdd7393 100644 --- a/targets/firefox/firefox_app/fx_browser.py +++ b/targets/firefox/firefox_app/fx_browser.py @@ -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()