adafruit-mirror/Adafruit_Blinka
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Remove return_toml param

Browse source
This commit is contained in:
Justin Myers 2025-03-04 08:28:29 -08:00
parent 5b94da4fc3
commit 046217cbbf
2 changed files with 9 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/adafruit_blinka/__init__.py
View file

@ -81,7 +81,7 @@ class Lockable(ContextManaged):
self._locked = False self._locked = False
def load_settings_toml(*, return_toml=False): def load_settings_toml():
"""Load values from settings.toml into os.environ, so that os.getenv returns them.""" """Load values from settings.toml into os.environ, so that os.getenv returns them."""
if not os.path.isfile("settings.toml"): if not os.path.isfile("settings.toml"):
raise FileNotFoundError("settings.toml not cound in current directory.") raise FileNotFoundError("settings.toml not cound in current directory.")
@ -111,9 +111,7 @@ def load_settings_toml(*, return_toml=False):
os.environ[key] = str(value) os.environ[key] = str(value)
print(f" - {key} added") print(f" - {key} added")
if return_toml:
return settings return settings
return None
def patch_system(): def patch_system():

26
tests/test_load_settings_toml.py
View file

@ -79,7 +79,7 @@ class TestLoadSettingsToml:
with pytest.raises( with pytest.raises(
FileNotFoundError, match="settings.toml not cound in current directory." FileNotFoundError, match="settings.toml not cound in current directory."
): ):
load_settings_toml(return_toml=True) load_settings_toml()
@mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True)) @mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True))
@mock.patch("builtins.open", mock.mock_open(read_data=INVALID_TOML)) @mock.patch("builtins.open", mock.mock_open(read_data=INVALID_TOML))
@ -87,7 +87,7 @@ class TestLoadSettingsToml:
with pytest.raises( with pytest.raises(
tomllib.TOMLDecodeError, match="Error with settings.toml file." tomllib.TOMLDecodeError, match="Error with settings.toml file."
): ):
load_settings_toml(return_toml=True) load_settings_toml()
@mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True)) @mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True))
@mock.patch( @mock.patch(
@ -97,7 +97,7 @@ class TestLoadSettingsToml:
with pytest.raises( with pytest.raises(
ValueError, match="The types: 'dict' are not supported in settings.toml." ValueError, match="The types: 'dict' are not supported in settings.toml."
): ):
load_settings_toml(return_toml=True) load_settings_toml()
@mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True)) @mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True))
@mock.patch( @mock.patch(
@ -107,7 +107,7 @@ class TestLoadSettingsToml:
with pytest.raises( with pytest.raises(
ValueError, match="The types: 'list' are not supported in settings.toml." ValueError, match="The types: 'list' are not supported in settings.toml."
): ):
load_settings_toml(return_toml=True) load_settings_toml()
@mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True)) @mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True))
@mock.patch( @mock.patch(
@ -118,7 +118,7 @@ class TestLoadSettingsToml:
ValueError, ValueError,
match="The types: 'dict, list' are not supported in settings.toml.", match="The types: 'dict, list' are not supported in settings.toml.",
): ):
load_settings_toml(return_toml=True) load_settings_toml()
@mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True)) @mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True))
@mock.patch( @mock.patch(
@ -129,7 +129,7 @@ class TestLoadSettingsToml:
with pytest.raises( with pytest.raises(
ValueError, match="The types: 'dict' are not supported in settings.toml." ValueError, match="The types: 'dict' are not supported in settings.toml."
): ):
load_settings_toml(return_toml=True) load_settings_toml()
@mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True)) @mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True))
@mock.patch("builtins.open", mock.mock_open(read_data=VALID_TOML)) @mock.patch("builtins.open", mock.mock_open(read_data=VALID_TOML))
@ -138,19 +138,7 @@ class TestLoadSettingsToml:
for key in CONVERTED_TOML: for key in CONVERTED_TOML:
assert os.getenv(key) is None assert os.getenv(key) is None
assert load_settings_toml() is None assert load_settings_toml() == CONVERTED_TOML
for key, value in CONVERTED_TOML.items():
assert os.getenv(key) == str(value)
@mock.patch("adafruit_blinka.os.path.isfile", mock.Mock(return_value=True))
@mock.patch("builtins.open", mock.mock_open(read_data=VALID_TOML))
@mock.patch.dict(os.environ, {}, clear=True)
def test_returns_data_when_asked(self):
for key in CONVERTED_TOML:
assert os.getenv(key) is None
assert load_settings_toml(return_toml=True) == CONVERTED_TOML
for key, value in CONVERTED_TOML.items(): for key, value in CONVERTED_TOML.items():
assert os.getenv(key) == str(value) assert os.getenv(key) == str(value)