ProjectHentai/nonebot2
6
0
Fork 0
mirror of https://github.com/nonebot/nonebot2.git synced 2024-11-27 18:45:05 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 fix env var not override dotenv file (#1052)

Browse Source
This commit is contained in:
Ju4tCode 2022-06-18 14:47:42 +08:00 committed by GitHub
parent a62a49d477
commit 7b06469a30
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
nonebot/config.py
View File

@ -83,9 +83,8 @@ class CustomEnvSettings(EnvSettingsSource):
d[field.alias] = env_val d[field.alias] = env_val
if env_file_vars: if env_file_vars:
for env_name, env_val in env_file_vars.items(): for env_name in env_file_vars.keys():
if (env_val is None or len(env_val) == 0) and env_name in env_vars: env_val = env_vars[env_name]
env_val = env_vars[env_name]
try: try:
if env_val: if env_val:
env_val = settings.__config__.json_loads(env_val.strip()) env_val = settings.__config__.json_loads(env_val.strip())

1
tests/.env.test
View File

@ -2,3 +2,4 @@ LOG_LEVEL=TRACE
NICKNAME=["test"] NICKNAME=["test"]
SUPERUSERS=["test", "fake:faketest"] SUPERUSERS=["test", "fake:faketest"]
CONFIG_FROM_ENV= CONFIG_FROM_ENV=
CONFIG_OVERRIDE=old

2
tests/test_init.py
View File

@ -3,6 +3,7 @@ import os
import pytest import pytest
os.environ["CONFIG_FROM_ENV"] = '{"test": "test"}' os.environ["CONFIG_FROM_ENV"] = '{"test": "test"}'
os.environ["CONFIG_OVERRIDE"] = "new"
@pytest.mark.asyncio @pytest.mark.asyncio
@ -25,6 +26,7 @@ async def test_init(nonebug_init):
config = get_driver().config config = get_driver().config
assert config.config_from_env == {"test": "test"} assert config.config_from_env == {"test": "test"}
assert config.config_override == "new"
assert config.config_from_init == "init" assert config.config_from_init == "init"
assert config.common_config == "common" assert config.common_config == "common"