From 11ed934ed5fc178aa0948c892329cae1130ed31e Mon Sep 17 00:00:00 2001 From: Michael Mintz Date: Sat, 8 Jul 2023 15:06:43 -0400 Subject: [PATCH] Do some refactoring --- seleniumbase/plugins/pytest_plugin.py | 5 ++++- seleniumbase/plugins/selenium_plugin.py | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/seleniumbase/plugins/pytest_plugin.py b/seleniumbase/plugins/pytest_plugin.py index 08497574..898bd3e4 100644 --- a/seleniumbase/plugins/pytest_plugin.py +++ b/seleniumbase/plugins/pytest_plugin.py @@ -1972,7 +1972,10 @@ def pytest_terminal_summary(terminalreporter): def _perform_pytest_unconfigure_(): from seleniumbase.core import proxy_helper - if not sb_config.multi_proxy: + if ( + (hasattr(sb_config, "multi_proxy") and not sb_config.multi_proxy) + or not hasattr(sb_config, "multi_proxy") + ): proxy_helper.remove_proxy_zip_if_present() if hasattr(sb_config, "reuse_session") and sb_config.reuse_session: # Close the shared browser session diff --git a/seleniumbase/plugins/selenium_plugin.py b/seleniumbase/plugins/selenium_plugin.py index 375a62fd..f8b33732 100644 --- a/seleniumbase/plugins/selenium_plugin.py +++ b/seleniumbase/plugins/selenium_plugin.py @@ -1225,7 +1225,10 @@ class SeleniumBrowser(Plugin): def finalize(self, result): """This runs after all tests have completed with nosetests.""" - if not sb_config.multi_proxy: + if ( + (hasattr(sb_config, "multi_proxy") and not sb_config.multi_proxy) + or not hasattr(sb_config, "multi_proxy") + ): proxy_helper.remove_proxy_zip_if_present() def afterTest(self, test):