From f1b260655d29ed187702e291ddba40452fd785a5 Mon Sep 17 00:00:00 2001 From: Suhas Date: Mon, 25 Jan 2021 08:55:27 -0500 Subject: [PATCH] make format --- tests/test_config.py | 20 ++++++++------------ tests/test_override.py | 21 ++++++++++----------- tests/test_parse_args.py | 6 ++++-- 3 files changed, 22 insertions(+), 25 deletions(-) diff --git a/tests/test_config.py b/tests/test_config.py index 2c8a5eff..20e1236a 100644 --- a/tests/test_config.py +++ b/tests/test_config.py @@ -1,11 +1,12 @@ import pytest - import mock import yaml + from jrnl.args import parse_args from jrnl.jrnl import run from jrnl import install +from jrnl import jrnl @pytest.fixture() @@ -15,15 +16,11 @@ def minimal_config(): "default": "/tmp/journal.jrnl", "editor": "vim", "encrypt": False, - "journals": { - "default": "/tmp/journals/journal.jrnl" - } - + "journals": {"default": "/tmp/journals/journal.jrnl"}, } yield cfg - @pytest.fixture() def expected_override(minimal_config): exp_out_cfg = minimal_config.copy() @@ -32,9 +29,6 @@ def expected_override(minimal_config): yield exp_out_cfg -from jrnl import jrnl - - @mock.patch("sys.stdin.isatty") @mock.patch.object(install, "load_or_install_jrnl") @mock.patch("subprocess.call") @@ -70,13 +64,15 @@ def test_override_configured_editor( @pytest.fixture() def expected_color_override(minimal_config): exp_out_cfg = minimal_config.copy() - exp_out_cfg["colors"]["body"] = "blue" + exp_out_cfg["colors"]["body"] = "blue" exp_out_cfg["journal"] = "/tmp/journals/journal.jrnl" yield exp_out_cfg @mock.patch("sys.stdin.isatty") -@mock.patch("jrnl.install.load_or_install_jrnl", wraps=jrnl.install.load_or_install_jrnl) +@mock.patch( + "jrnl.install.load_or_install_jrnl", wraps=jrnl.install.load_or_install_jrnl +) @mock.patch("subprocess.call") def test_override_configured_colors( mock_isatty, @@ -94,7 +90,7 @@ def test_override_configured_colors( with mock.patch.object( jrnl, "_write_in_editor", - side_effect= print("side effect!"), + side_effect=print("side effect!"), return_value="note_contents", ) as mock_write_in_editor: run(parser) diff --git a/tests/test_override.py b/tests/test_override.py index 0290385a..5303d78c 100644 --- a/tests/test_override.py +++ b/tests/test_override.py @@ -9,10 +9,7 @@ def minimal_config(): "colors": {"body": "red", "date": "green"}, "default": "/tmp/journal.jrnl", "editor": "vim", - "journals": { - "default": "/tmp/journals/journal.jrnl" - } - + "journals": {"default": "/tmp/journals/journal.jrnl"}, } yield cfg @@ -30,18 +27,20 @@ def test_override_dot_notation(minimal_config): cfg = apply_overrides(overrides=overrides, base_config=cfg) assert cfg["colors"] == {"body": "blue", "date": "green"} -def test_multiple_overrides(minimal_config): - overrides = { - "colors.title": "magenta", - "editor": "nano", - "journals.burner": "/tmp/journals/burner.jrnl" - } # as returned by parse_args, saved in parser.config_override + +def test_multiple_overrides(minimal_config): + overrides = { + "colors.title": "magenta", + "editor": "nano", + "journals.burner": "/tmp/journals/burner.jrnl", + } # as returned by parse_args, saved in parser.config_override cfg = apply_overrides(overrides, minimal_config.copy()) - assert cfg["editor"] == "nano" + assert cfg["editor"] == "nano" assert cfg["colors"]["title"] == "magenta" assert "burner" in cfg["journals"] assert cfg["journals"]["burner"] == "/tmp/journals/burner.jrnl" + def test_recursively_apply(): cfg = {"colors": {"body": "red", "title": "green"}} cfg = _recursively_apply(cfg, ["colors", "body"], "blue") diff --git a/tests/test_parse_args.py b/tests/test_parse_args.py index 67931892..6ce40338 100644 --- a/tests/test_parse_args.py +++ b/tests/test_parse_args.py @@ -219,17 +219,19 @@ def test_color_override(): '--config-override \'{"colors.body": "blue"}\'' ) == expected_args(config_override={"colors.body": "blue"}) -def test_multiple_overrides(): + +def test_multiple_overrides(): assert cli_as_dict( '--config-override \'{"colors.title": "green", "editor":"", "journal.scratchpad": "/tmp/scratchpad"}\'' ) == expected_args( config_override={ "colors.title": "green", "journal.scratchpad": "/tmp/scratchpad", - "editor": "" + "editor": "", } ) + # @see https://github.com/jrnl-org/jrnl/issues/520 @pytest.mark.parametrize( "cli",