Merging upstream version 0.16.5.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

2 files changed, 8 insertions, 5 deletions

diff --git a/tests/test_main.py b/tests/test_main.py
index 441c14a..6d05867 100644
--- a/tests/test_main.py
+++ b/tests/test_main.py
@@ -130,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",
             ),
         ],
     )
@@ -186,6 +186,7 @@ def test_clone_with_url(mock_run):
     args.preserve_path = None
     args.directory = "/home/xxx"
     args.from_file = False
+    args.dry_run = False
     __main__.f_clone(args)
     cmds = ["git", "clone", args.clonee]
     mock_run.assert_called_once_with(cmds, cwd=args.directory)
@@ -204,6 +205,7 @@ def test_clone_with_config_file(*_):
     args.preserve_path = False
     args.directory = None
     args.from_file = True
+    args.dry_run = False
     __main__.f_clone(args)
     mock_run = utils.run_async.mock
     assert mock_run.call_count == 1
@@ -224,6 +226,7 @@ def test_clone_with_preserve_path(*_):
     args.directory = None
     args.from_file = True
     args.preserve_path = True
+    args.dry_run = False
     __main__.f_clone(args)
     mock_run = utils.run_async.mock
     assert mock_run.call_count == 1
diff --git a/tests/test_utils.py b/tests/test_utils.py
index acf9853..1e4f125 100644
--- a/tests/test_utils.py
+++ b/tests/test_utils.py
@@ -115,17 +115,17 @@ def test_auto_group(repos, paths, expected):
         (
             [{"abc": {"path": "/root/repo/", "type": "", "flags": []}}, False],
             True,
-            "abc \x1b[31mrepo [*+?]   \x1b[0m msg xx",
+            "abc \x1b[31mrepo       [*+?] \x1b[0m msg xx",
         ),
         (
             [{"abc": {"path": "/root/repo/", "type": "", "flags": []}}, True],
             True,
-            "abc repo [*+?]    msg xx",
+            "abc repo       [*+?]  msg xx",
         ),
         (
             [{"repo": {"path": "/root/repo2/", "type": "", "flags": []}}, False],
             False,
-            "repo \x1b[32mrepo [?]     \x1b[0m msg xx",
+            "repo \x1b[32mrepo       [?]   \x1b[0m msg xx",
         ),
     ],
 )