From c23282819b605885e64ba864159812d7546be81c Mon Sep 17 00:00:00 2001 From: Alessio Bogon <778703+youtux@users.noreply.github.com> Date: Sat, 11 Nov 2023 20:35:24 +0100 Subject: [PATCH] No need to keep a counter, just try to pop from the stack if any --- src/pytest_bdd/plugin.py | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/src/pytest_bdd/plugin.py b/src/pytest_bdd/plugin.py index 7ad8ff6..08ceaa0 100644 --- a/src/pytest_bdd/plugin.py +++ b/src/pytest_bdd/plugin.py @@ -21,10 +21,6 @@ if TYPE_CHECKING: from .parser import Feature, Scenario, Step -# Counter to track how many times pytest initialization was started -_INIT_COUNT = 0 - - def pytest_addhooks(pluginmanager: PytestPluginManager) -> None: """Register plugin hooks.""" from pytest_bdd import hooks @@ -56,8 +52,6 @@ def _pytest_bdd_example() -> dict: def pytest_addoption(parser: Parser) -> None: """Add pytest-bdd options.""" - global _INIT_COUNT - _INIT_COUNT += 1 add_bdd_ini(parser) cucumber_json.add_options(parser) generation.add_options(parser) @@ -72,19 +66,15 @@ def add_bdd_ini(parser: Parser) -> None: def pytest_configure(config: Config) -> None: """Configure all subplugins.""" CONFIG_STACK.append(config) - assert _INIT_COUNT == len(CONFIG_STACK) cucumber_json.configure(config) gherkin_terminal_reporter.configure(config) def pytest_unconfigure(config: Config) -> None: """Unconfigure all subplugins.""" - global _INIT_COUNT - assert len(CONFIG_STACK) <= _INIT_COUNT - if len(CONFIG_STACK) == _INIT_COUNT: + if CONFIG_STACK: CONFIG_STACK.pop() - cucumber_json.unconfigure(config) - _INIT_COUNT -= 1 + cucumber_json.unconfigure(config) @pytest.hookimpl(hookwrapper=True)