diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-01-09 07:44:06 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2022-01-09 07:44:15 +0000 |
| commit | 74e70d5613813fb731614dbdb4c9f722263a9cd0 (patch) | |
| tree | efd3527249ffb15caf496a28d68fb792e988bd1b /tests | |
| parent | Releasing debian version 0.15.9-1. (diff) | |
| download | gita-74e70d5613813fb731614dbdb4c9f722263a9cd0.tar.xz gita-74e70d5613813fb731614dbdb4c9f722263a9cd0.zip | |
Merging upstream version 0.16.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/conftest.py | 1 | ||||
| -rw-r--r-- | tests/main_path_file | 2 | ||||
| -rw-r--r-- | tests/test_main.py | 5 | ||||
| -rw-r--r-- | tests/test_utils.py | 2 |
4 files changed, 3 insertions, 7 deletions
diff --git a/tests/conftest.py b/tests/conftest.py index 93576d6..b3e59ed 100644 --- a/tests/conftest.py +++ b/tests/conftest.py @@ -11,7 +11,6 @@ def fullpath(fname: str): PATH_FNAME = fullpath('mock_path_file') PATH_FNAME_EMPTY = fullpath('empty_path_file') PATH_FNAME_CLASH = fullpath('clash_path_file') -PATH_FNAME_MAIN = fullpath('main_path_file') GROUP_FNAME = fullpath('mock_group_file') def async_mock(): diff --git a/tests/main_path_file b/tests/main_path_file deleted file mode 100644 index 8e87ffb..0000000 --- a/tests/main_path_file +++ /dev/null @@ -1,2 +0,0 @@ -/path/to/main/,main1,m -/xxx/xx,xx, 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': ''}, diff --git a/tests/test_utils.py b/tests/test_utils.py index 65096e9..7433532 100644 --- a/tests/test_utils.py +++ b/tests/test_utils.py @@ -176,4 +176,4 @@ def test_is_git(tmpdir): with tmpdir.as_cwd(): subprocess.run('git init --bare .'.split()) assert utils.is_git(Path.cwd()) is False - assert utils.is_git(Path.cwd(), is_bare=True) is True + assert utils.is_git(Path.cwd(), include_bare=True) is True |