From 335c010ac5fbaf2bc33cb7f28ceac3d5bfffb677 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Thu, 13 Jul 2023 07:37:58 +0200 Subject: Merging upstream version 0.16.4. Signed-off-by: Daniel Baumann --- tests/test_main.py | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'tests/test_main.py') diff --git a/tests/test_main.py b/tests/test_main.py index 0f2eeb5..441c14a 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -71,6 +71,7 @@ class TestLsLl: """ functional test """ + # avoid modifying the local configuration def side_effect(input, _=None): return tmp_path / f"{input}.txt" @@ -129,12 +130,12 @@ class TestLsLl: [ ( PATH_FNAME, - "repo1 cmaster dsu\x1b[0m msg \nrepo2 cmaster dsu\x1b[0m msg \nxxx cmaster dsu\x1b[0m msg \n", + "repo1 cmaster [dsu] \x1b[0m msg \nrepo2 cmaster [dsu] \x1b[0m msg \nxxx cmaster [dsu] \x1b[0m msg \n", ), (PATH_FNAME_EMPTY, ""), ( PATH_FNAME_CLASH, - "repo1 cmaster dsu\x1b[0m msg \nrepo2 cmaster dsu\x1b[0m msg \n", + "repo1 cmaster [dsu] \x1b[0m msg \nrepo2 cmaster [dsu] \x1b[0m msg \n", ), ], ) @@ -527,7 +528,9 @@ class TestInfo: args.info_cmd = None __main__.f_info(args) out, err = capfd.readouterr() - assert "In use: branch,commit_msg,commit_time\nUnused: path\n" == out + assert ( + "In use: branch,commit_msg,commit_time\nUnused: branch_name,path\n" == out + ) assert err == "" @patch("gita.common.get_config_fname") -- cgit v1.2.3