From 74e70d5613813fb731614dbdb4c9f722263a9cd0 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Sun, 9 Jan 2022 08:44:06 +0100 Subject: Merging upstream version 0.16.1. Signed-off-by: Daniel Baumann --- tests/test_main.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) (limited to 'tests/test_main.py') diff --git a/tests/test_main.py b/tests/test_main.py index b39ed47..3941ea9 100644 --- a/tests/test_main.py +++ b/tests/test_main.py @@ -9,7 +9,7 @@ import shlex from gita import __main__ from gita import utils, info, common from conftest import ( - PATH_FNAME, PATH_FNAME_EMPTY, PATH_FNAME_CLASH, GROUP_FNAME, PATH_FNAME_MAIN, + PATH_FNAME, PATH_FNAME_EMPTY, PATH_FNAME_CLASH, GROUP_FNAME, async_mock, TEST_DIR, ) @@ -115,8 +115,6 @@ class TestLsLl: (PATH_FNAME, "repo1 cmaster dsu\x1b[0m msg \nrepo2 cmaster dsu\x1b[0m msg \nxxx cmaster dsu\x1b[0m msg \n"), (PATH_FNAME_EMPTY, ""), - (PATH_FNAME_MAIN, - '\x1b[4mmain1\x1b[0m cmaster dsu\x1b[0m msg \nxx cmaster dsu\x1b[0m msg \n'), (PATH_FNAME_CLASH, "repo1 cmaster dsu\x1b[0m msg \nrepo2 cmaster dsu\x1b[0m msg \n" ), @@ -188,6 +186,7 @@ def test_clone_with_preserve_path(*_): mock_run.assert_called_once_with('repo', Path.cwd(), cmds) +@patch('os.makedirs') @patch('os.path.isfile', return_value=True) @patch('gita.common.get_config_fname', return_value='some path') @patch('gita.utils.get_repos', return_value={'repo1': {'path': '/a/', 'type': ''}, -- cgit v1.2.3