From 01935754dc4648e4435505483a8058ee7ea4ae4a Mon Sep 17 00:00:00 2001 From: ptiurin Date: Wed, 24 May 2023 13:54:51 +0100 Subject: [PATCH 1/2] test: Add failing settings test --- tests/unit/common/test_settings.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/tests/unit/common/test_settings.py b/tests/unit/common/test_settings.py index 3d1cb96d81b..cd4c23c4c14 100644 --- a/tests/unit/common/test_settings.py +++ b/tests/unit/common/test_settings.py @@ -48,11 +48,16 @@ def test_settings_auth_credentials(kwargs) -> None: def test_no_deprecation_warning_with_env(logger_mock: Mock): with patch.dict( os.environ, - {"FIREBOLT_USER": "user", "FIREBOLT_PASSWORD": "password"}, + { + "FIREBOLT_USER": "user", + "FIREBOLT_PASSWORD": "password", + "FIREBOLT_SERVER": "dummy.firebolt.io", + }, clear=True, ): - s = Settings(server="server", default_region="region") + s = Settings(default_region="region") logger_mock.warning.assert_not_called() + assert s.server == "dummy.firebolt.io" assert s.auth is not None, "Settings.auth wasn't populated from env variables" assert s.auth.username == "user", "Invalid username in Settings.auth" assert s.auth.password == "password", "Invalid password in Settings.auth" From 0629a359db42584ab5b488e4bdd664c026fd9a21 Mon Sep 17 00:00:00 2001 From: Stepan Burlakov Date: Wed, 24 May 2023 16:16:35 +0300 Subject: [PATCH 2/2] fix unit test --- src/firebolt/common/settings.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/firebolt/common/settings.py b/src/firebolt/common/settings.py index 0864e2a5fbc..663b17a7fc4 100644 --- a/src/firebolt/common/settings.py +++ b/src/firebolt/common/settings.py @@ -33,7 +33,7 @@ def from_env(var_name: str, default: Any = None) -> Callable: def inner() -> Any: - os.environ.get(var_name, default) + return os.environ.get(var_name, default) return inner