This commit is contained in:
Suhas 2021-01-24 16:07:57 -05:00
parent b92dd7edc7
commit ededf23afa

View file

@ -16,10 +16,10 @@ import keyring
import mock import mock
import toml import toml
import yaml import yaml
from yaml.loader import FullLoader
import jrnl.time import jrnl.time
from jrnl import Journal, override from jrnl import Journal
from jrnl import __version__ from jrnl import __version__
from jrnl import plugins from jrnl import plugins
from jrnl.cli import cli from jrnl.cli import cli
@ -220,7 +220,7 @@ def config_override(context, key_as_dots: str, override_value: str):
with open(context.config_path) as f: with open(context.config_path) as f:
loaded_cfg = yaml.load(f, Loader=yaml.FullLoader) loaded_cfg = yaml.load(f, Loader=yaml.FullLoader)
loaded_cfg["journal"] = "features/journals/simple.journal" loaded_cfg["journal"] = "features/journals/simple.journal"
base_cfg = loaded_cfg.copy() # base_cfg = loaded_cfg.copy()
def _mock_callback(**args): def _mock_callback(**args):
print("callback executed") print("callback executed")
@ -233,13 +233,8 @@ def config_override(context, key_as_dots: str, override_value: str):
patch("jrnl.install.get_config_path", side_effect=lambda: context.config_path) \ patch("jrnl.install.get_config_path", side_effect=lambda: context.config_path) \
: :
cli(['-1','--config-override', '{"%s": "%s"}'%(key_as_dots,override_value)]) cli(['-1','--config-override', '{"%s": "%s"}'%(key_as_dots,override_value)])
# mock_recurse.assert_any_call(base_cfg,key_as_dots.split('.'),override_value) mock_recurse.assert_called()
keys_list = key_as_dots.split('.')
callList = [
(base_cfg,keys_list,override_value),
(base_cfg,keys_list[1], override_value)
]
mock_recurse.call_args_list
except SystemExit as e : except SystemExit as e :
context.exit_status = e.code context.exit_status = e.code