fix unit tests

nosarthur · Jul 24, 2023 · 2e6fba3 · 2e6fba3
1 parent 7540678
commit 2e6fba3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/gita/info.py b/gita/info.py
@@ -170,7 +170,12 @@ def has_stashed(flags: List[str], path) -> bool:
     """
     # FIXME: this doesn't work for repos like worktrees, bare, etc
     p = Path(path) / ".git" / "logs" / "refs" / "stash"
-    return p.is_file()
+    got = False
+    try:
+        got = p.is_file()
+    except Exception:
+        pass
+    return got
 
 
 def get_commit_msg(prop: Dict[str, str]) -> str:

diff --git a/tests/test_main.py b/tests/test_main.py
@@ -143,7 +143,7 @@ def test_ls(self, monkeypatch, capfd):
     @patch("gita.info.get_head", return_value="master")
     @patch(
         "gita.info._get_repo_status",
-        return_value=("dirty", "staged", "untracked", "diverged"),
+        return_value=("dirty", "staged", "untracked", "", "diverged"),
     )
     @patch("gita.info.get_commit_msg", return_value="msg")
     @patch("gita.info.get_commit_time", return_value="")