add types to several test files

Author: BenediktSeidl

test/test_repository_custom.py

@@ -24,15 +24,17 @@
 # Boston, MA 02110-1301, USA.
 
 from pathlib import Path
+from typing import Generator
 
 import pytest
 
 import pygit2
+from pygit2 import Repository
 from pygit2.enums import ObjectType
 
 
 @pytest.fixture
-def repo(testrepopacked):
+def repo(testrepopacked: Repository) -> Generator[Repository, None, None]:
     testrepo = testrepopacked
 
     odb = pygit2.Odb()
@@ -49,14 +51,14 @@ def repo(testrepopacked):
     yield repo
 
 
-def test_references(repo):
+def test_references(repo: Repository) -> None:
     refs = [(ref.name, ref.target) for ref in repo.references.objects]
     assert sorted(refs) == [
         ('refs/heads/i18n', '5470a671a80ac3789f1a6a8cefbcf43ce7af0563'),
         ('refs/heads/master', '2be5719152d4f82c7302b1c0932d8e5f0a4a0e98'),
     ]
 
 
-def test_objects(repo):
+def test_objects(repo: Repository) -> None:
     a = repo.read('323fae03f4606ea9991df8befbb2fca795e648fa')
     assert (ObjectType.BLOB, b'foobar\n') == a

test/test_repository_empty.py

@@ -23,15 +23,17 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
+from pygit2 import Repository
 
-def test_is_empty(emptyrepo):
+
+def test_is_empty(emptyrepo: Repository) -> None:
     assert emptyrepo.is_empty
 
 
-def test_is_base(emptyrepo):
+def test_is_base(emptyrepo: Repository) -> None:
     assert not emptyrepo.is_bare
 
 
-def test_head(emptyrepo):
+def test_head(emptyrepo: Repository) -> None:
     assert emptyrepo.head_is_unborn
     assert not emptyrepo.head_is_detached

test/test_revparse.py

@@ -27,21 +27,21 @@
 
 from pytest import raises
 
-from pygit2 import InvalidSpecError
+from pygit2 import InvalidSpecError, Repository
 from pygit2.enums import RevSpecFlag
 
 HEAD_SHA = '2be5719152d4f82c7302b1c0932d8e5f0a4a0e98'
 PARENT_SHA = '5ebeeebb320790caf276b9fc8b24546d63316533'  # HEAD^
 
 
-def test_revparse_single(testrepo):
+def test_revparse_single(testrepo: Repository) -> None:
     assert testrepo.revparse_single('HEAD').id == HEAD_SHA
     assert testrepo.revparse_single('HEAD^').id == PARENT_SHA
     o = testrepo.revparse_single('@{-1}')
     assert o.id == '5470a671a80ac3789f1a6a8cefbcf43ce7af0563'
 
 
-def test_revparse_ext(testrepo):
+def test_revparse_ext(testrepo: Repository) -> None:
     o, r = testrepo.revparse_ext('master')
     assert o.id == HEAD_SHA
     assert r == testrepo.references['refs/heads/master']
@@ -55,37 +55,37 @@ def test_revparse_ext(testrepo):
     assert r == testrepo.references['refs/heads/i18n']
 
 
-def test_revparse_1(testrepo):
+def test_revparse_1(testrepo: Repository) -> None:
     s = testrepo.revparse('master')
     assert s.from_object.id == HEAD_SHA
     assert s.to_object is None
     assert s.flags == RevSpecFlag.SINGLE
 
 
-def test_revparse_range_1(testrepo):
+def test_revparse_range_1(testrepo: Repository) -> None:
     s = testrepo.revparse('HEAD^1..acecd5e')
     assert s.from_object.id == PARENT_SHA
     assert str(s.to_object.id).startswith('acecd5e')
     assert s.flags == RevSpecFlag.RANGE
 
 
-def test_revparse_range_2(testrepo):
+def test_revparse_range_2(testrepo: Repository) -> None:
     s = testrepo.revparse('HEAD...i18n')
     assert str(s.from_object.id).startswith('2be5719')
     assert str(s.to_object.id).startswith('5470a67')
     assert s.flags == RevSpecFlag.RANGE | RevSpecFlag.MERGE_BASE
     assert testrepo.merge_base(s.from_object.id, s.to_object.id) is not None
 
 
-def test_revparse_range_errors(testrepo):
+def test_revparse_range_errors(testrepo: Repository) -> None:
     with raises(KeyError):
         testrepo.revparse('nope..2be571915')
 
     with raises(InvalidSpecError):
         testrepo.revparse('master............2be571915')
 
 
-def test_revparse_repr(testrepo):
+def test_revparse_repr(testrepo: Repository) -> None:
     s = testrepo.revparse('HEAD...i18n')
     assert (
         repr(s)

test/test_revwalk.py

@@ -25,6 +25,7 @@
 
 """Tests for revision walk."""
 
+from pygit2 import Repository
 from pygit2.enums import SortMode
 
 # In the order given by git log
@@ -50,62 +51,62 @@
 ]
 
 
-def test_log(testrepo):
+def test_log(testrepo: Repository) -> None:
     ref = testrepo.lookup_reference('HEAD')
     for i, entry in enumerate(ref.log()):
         assert entry.committer.name == REVLOGS[i][0]
         assert entry.message == REVLOGS[i][1]
 
 
-def test_walk(testrepo):
+def test_walk(testrepo: Repository) -> None:
     walker = testrepo.walk(log[0], SortMode.TIME)
     assert [x.id for x in walker] == log
 
 
-def test_reverse(testrepo):
+def test_reverse(testrepo: Repository) -> None:
     walker = testrepo.walk(log[0], SortMode.TIME | SortMode.REVERSE)
     assert [x.id for x in walker] == list(reversed(log))
 
 
-def test_hide(testrepo):
+def test_hide(testrepo: Repository) -> None:
     walker = testrepo.walk(log[0], SortMode.TIME)
     walker.hide('4ec4389a8068641da2d6578db0419484972284c8')
     assert len(list(walker)) == 2
 
 
-def test_hide_prefix(testrepo):
+def test_hide_prefix(testrepo: Repository) -> None:
     walker = testrepo.walk(log[0], SortMode.TIME)
     walker.hide('4ec4389a')
     assert len(list(walker)) == 2
 
 
-def test_reset(testrepo):
+def test_reset(testrepo: Repository) -> None:
     walker = testrepo.walk(log[0], SortMode.TIME)
     walker.reset()
     assert list(walker) == []
 
 
-def test_push(testrepo):
+def test_push(testrepo: Repository) -> None:
     walker = testrepo.walk(log[-1], SortMode.TIME)
     assert [x.id for x in walker] == log[-1:]
     walker.reset()
     walker.push(log[0])
     assert [x.id for x in walker] == log
 
 
-def test_sort(testrepo):
+def test_sort(testrepo: Repository) -> None:
     walker = testrepo.walk(log[0], SortMode.TIME)
     walker.sort(SortMode.TIME | SortMode.REVERSE)
     assert [x.id for x in walker] == list(reversed(log))
 
 
-def test_simplify_first_parent(testrepo):
+def test_simplify_first_parent(testrepo: Repository) -> None:
     walker = testrepo.walk(log[0], SortMode.TIME)
     walker.simplify_first_parent()
     assert len(list(walker)) == 3
 
 
-def test_default_sorting(testrepo):
+def test_default_sorting(testrepo: Repository) -> None:
     walker = testrepo.walk(log[0], SortMode.NONE)
     list1 = list([x.id for x in walker])
     walker = testrepo.walk(log[0])

test/test_status.py

@@ -25,10 +25,11 @@
 
 import pytest
 
+from pygit2 import Repository
 from pygit2.enums import FileStatus
 
 
-def test_status(dirtyrepo):
+def test_status(dirtyrepo: Repository) -> None:
     """
     For every file in the status, check that the flags are correct.
     """
@@ -38,7 +39,7 @@ def test_status(dirtyrepo):
         assert status == git_status[filepath]
 
 
-def test_status_untracked_no(dirtyrepo):
+def test_status_untracked_no(dirtyrepo: Repository) -> None:
     git_status = dirtyrepo.status(untracked_files='no')
     assert not any(status & FileStatus.WT_NEW for status in git_status.values())
 
@@ -67,15 +68,19 @@ def test_status_untracked_no(dirtyrepo):
         ),
     ],
 )
-def test_status_untracked_normal(dirtyrepo, untracked_files, expected):
+def test_status_untracked_normal(
+    dirtyrepo: Repository, untracked_files: str, expected: set[str]
+) -> None:
     git_status = dirtyrepo.status(untracked_files=untracked_files)
     assert {
         file for file, status in git_status.items() if status & FileStatus.WT_NEW
     } == expected
 
 
 @pytest.mark.parametrize('ignored,expected', [(True, {'ignored'}), (False, set())])
-def test_status_ignored(dirtyrepo, ignored, expected):
+def test_status_ignored(
+    dirtyrepo: Repository, ignored: bool, expected: set[str]
+) -> None:
     git_status = dirtyrepo.status(ignored=ignored)
     assert {
         file for file, status in git_status.items() if status & FileStatus.IGNORED

test/test_tag.py

@@ -28,18 +28,20 @@
 import pytest
 
 import pygit2
+from pygit2 import Repository
 from pygit2.enums import ObjectType
 
 TAG_SHA = '3d2962987c695a29f1f80b6c3aa4ec046ef44369'
 
 
-def test_read_tag(barerepo):
+def test_read_tag(barerepo: Repository) -> None:
     repo = barerepo
     tag = repo[TAG_SHA]
-    target = repo[tag.target]
     assert isinstance(tag, pygit2.Tag)
-    assert ObjectType.TAG == tag.type
-    assert ObjectType.COMMIT == target.type
+    target = repo[tag.target]
+    assert isinstance(target, pygit2.Commit)
+    assert int(ObjectType.TAG) == tag.type
+    assert int(ObjectType.COMMIT) == target.type
     assert 'root' == tag.name
     assert 'Tagged root commit.\n' == tag.message
     assert 'Initial test data commit.\n' == target.message
@@ -48,7 +50,7 @@ def test_read_tag(barerepo):
     )
 
 
-def test_new_tag(barerepo):
+def test_new_tag(barerepo: Repository) -> None:
     name = 'thetag'
     target = 'af431f20fc541ed6d5afede3e2dc7160f6f01f16'
     message = 'Tag a blob.\n'
@@ -57,10 +59,11 @@ def test_new_tag(barerepo):
     target_prefix = target[:5]
     too_short_prefix = target[:3]
     with pytest.raises(ValueError):
-        barerepo.create_tag(name, too_short_prefix, ObjectType.BLOB, tagger, message)
+        barerepo.create_tag(name, too_short_prefix, ObjectType.BLOB, tagger, message)  # type: ignore
 
     sha = barerepo.create_tag(name, target_prefix, ObjectType.BLOB, tagger, message)
     tag = barerepo[sha]
+    assert isinstance(tag, pygit2.Tag)
 
     assert '3ee44658fd11660e828dfc96b9b5c5f38d5b49bb' == tag.id
     assert name == tag.name
@@ -70,7 +73,7 @@ def test_new_tag(barerepo):
     assert name == barerepo[tag.id].name
 
 
-def test_modify_tag(barerepo):
+def test_modify_tag(barerepo: Repository) -> None:
     name = 'thetag'
     target = 'af431f20fc541ed6d5afede3e2dc7160f6f01f16'
     message = 'Tag a blob.\n'
@@ -87,7 +90,8 @@ def test_modify_tag(barerepo):
         setattr(tag, 'message', message)
 
 
-def test_get_object(barerepo):
+def test_get_object(barerepo: Repository) -> None:
     repo = barerepo
     tag = repo[TAG_SHA]
+    assert isinstance(tag, pygit2.Tag)
     assert repo[tag.target].id == tag.get_object().id

test/test_treebuilder.py

@@ -23,37 +23,42 @@
 # the Free Software Foundation, 51 Franklin Street, Fifth Floor,
 # Boston, MA 02110-1301, USA.
 
+from pygit2 import Repository, Tree
 
 TREE_SHA = '967fce8df97cc71722d3c2a5930ef3e6f1d27b12'
 
 
-def test_new_empty_treebuilder(barerepo):
+def test_new_empty_treebuilder(barerepo: Repository) -> None:
     barerepo.TreeBuilder()
 
 
-def test_noop_treebuilder(barerepo):
+def test_noop_treebuilder(barerepo: Repository) -> None:
     tree = barerepo[TREE_SHA]
+    assert isinstance(tree, Tree)
     bld = barerepo.TreeBuilder(TREE_SHA)
     result = bld.write()
 
     assert len(bld) == len(tree)
     assert tree.id == result
 
 
-def test_noop_treebuilder_from_tree(barerepo):
+def test_noop_treebuilder_from_tree(barerepo: Repository) -> None:
     tree = barerepo[TREE_SHA]
+    assert isinstance(tree, Tree)
     bld = barerepo.TreeBuilder(tree)
     result = bld.write()
 
     assert len(bld) == len(tree)
     assert tree.id == result
 
 
-def test_rebuild_treebuilder(barerepo):
+def test_rebuild_treebuilder(barerepo: Repository) -> None:
     tree = barerepo[TREE_SHA]
+    assert isinstance(tree, Tree)
     bld = barerepo.TreeBuilder()
     for entry in tree:
         name = entry.name
+        assert name is not None
         assert bld.get(name) is None
         bld.insert(name, entry.id, entry.filemode)
         assert bld.get(name).id == entry.id