From 48adc3ac19867ce9c52730641ccda711ca3d060a Mon Sep 17 00:00:00 2001 From: Krops Date: Wed, 11 Nov 2020 16:30:09 +0200 Subject: [PATCH 1/4] Fix issue if overide option is disabled envfile option overides without checking --- pytest_dotenv/plugin.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pytest_dotenv/plugin.py b/pytest_dotenv/plugin.py index 945e418..0a33551 100644 --- a/pytest_dotenv/plugin.py +++ b/pytest_dotenv/plugin.py @@ -28,7 +28,8 @@ def pytest_load_initial_conftests(args, early_config, parser): load_dotenv(find_dotenv(filename, usecwd=True), override=_override) -def pytest_sessionstart(session): +def pytest_sessionstart(session, early_config): config = session.config + _override = early_config.getini("env_override_existing_values") if config.getoption("envfile", default=None) is not None: - load_dotenv(dotenv_path=config.getoption("envfile"), override=True) + load_dotenv(dotenv_path=config.getoption("envfile"), override=_override) From 94d10c0052d3618c817f219e557dbd92579b3090 Mon Sep 17 00:00:00 2001 From: Krops Date: Wed, 11 Nov 2020 17:15:48 +0200 Subject: [PATCH 2/4] Fix error --- pytest_dotenv/plugin.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pytest_dotenv/plugin.py b/pytest_dotenv/plugin.py index 0a33551..2afa291 100644 --- a/pytest_dotenv/plugin.py +++ b/pytest_dotenv/plugin.py @@ -28,8 +28,10 @@ def pytest_load_initial_conftests(args, early_config, parser): load_dotenv(find_dotenv(filename, usecwd=True), override=_override) -def pytest_sessionstart(session, early_config): +def pytest_sessionstart(session): config = session.config - _override = early_config.getini("env_override_existing_values") + _override = False + if 'env_override_existing_values' in config.inicfg: + _override = config.inicfg['env_override_existing_values'] == "True" if config.getoption("envfile", default=None) is not None: load_dotenv(dotenv_path=config.getoption("envfile"), override=_override) From b0155af40cc14852d92611848516d95206c12f3c Mon Sep 17 00:00:00 2001 From: Krops Date: Wed, 11 Nov 2020 17:21:22 +0200 Subject: [PATCH 3/4] Change default override value --- pytest_dotenv/plugin.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pytest_dotenv/plugin.py b/pytest_dotenv/plugin.py index 2afa291..0998769 100644 --- a/pytest_dotenv/plugin.py +++ b/pytest_dotenv/plugin.py @@ -30,7 +30,7 @@ def pytest_load_initial_conftests(args, early_config, parser): def pytest_sessionstart(session): config = session.config - _override = False + _override = True if 'env_override_existing_values' in config.inicfg: _override = config.inicfg['env_override_existing_values'] == "True" if config.getoption("envfile", default=None) is not None: From 3c2bce426b011f44571c5ff28785cbfb0d80eefb Mon Sep 17 00:00:00 2001 From: Krops Date: Wed, 11 Nov 2020 17:42:52 +0200 Subject: [PATCH 4/4] Refactor --- pytest_dotenv/plugin.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/pytest_dotenv/plugin.py b/pytest_dotenv/plugin.py index 0998769..7fb7899 100644 --- a/pytest_dotenv/plugin.py +++ b/pytest_dotenv/plugin.py @@ -30,8 +30,6 @@ def pytest_load_initial_conftests(args, early_config, parser): def pytest_sessionstart(session): config = session.config - _override = True - if 'env_override_existing_values' in config.inicfg: - _override = config.inicfg['env_override_existing_values'] == "True" + _override = not config.inicfg.get('env_override_existing_values', "True") == "False" if config.getoption("envfile", default=None) is not None: load_dotenv(dotenv_path=config.getoption("envfile"), override=_override)