add types to test/test_odb_backend.py

Author: BenediktSeidl

test/test_odb_backend.py

@@ -28,11 +28,13 @@
 # Standard Library
 import binascii
 from pathlib import Path
+from typing import Generator, Iterator
 
 import pytest
 
 # pygit2
 import pygit2
+from pygit2 import Odb, Oid, Repository
 from pygit2.enums import ObjectType
 
 from . import utils
@@ -43,21 +45,21 @@
 
 
 @pytest.fixture
-def odb(barerepo):
+def odb_path(barerepo: Repository) -> Generator[tuple[Odb, Path], None, None]:
     yield barerepo.odb, Path(barerepo.path) / 'objects'
 
 
-def test_pack(odb):
-    odb, path = odb
+def test_pack(odb_path: tuple[Odb, Path]) -> None:
+    odb, path = odb_path
 
     pack = pygit2.OdbBackendPack(path)
     assert len(list(pack)) > 0
     for obj in pack:
         assert obj in odb
 
 
-def test_loose(odb):
-    odb, path = odb
+def test_loose(odb_path: tuple[Odb, Path]) -> None:
+    odb, path = odb_path
 
     pack = pygit2.OdbBackendLoose(path, 5, False)
     assert len(list(pack)) > 0
@@ -66,30 +68,30 @@ def test_loose(odb):
 
 
 class ProxyBackend(pygit2.OdbBackend):
-    def __init__(self, source):
+    def __init__(self, source: pygit2.OdbBackend | pygit2.OdbBackendPack) -> None:
         super().__init__()
         self.source = source
 
-    def read_cb(self, oid):
+    def read_cb(self, oid: Oid | str) -> tuple[int, bytes]:
         return self.source.read(oid)
 
-    def read_prefix_cb(self, oid):
+    def read_prefix_cb(self, oid: Oid | str) -> tuple[int, bytes, Oid]:
         return self.source.read_prefix(oid)
 
-    def read_header_cb(self, oid):
+    def read_header_cb(self, oid: Oid | str) -> tuple[int, int]:
         typ, data = self.source.read(oid)
         return typ, len(data)
 
-    def exists_cb(self, oid):
+    def exists_cb(self, oid: Oid | str) -> bool:
         return self.source.exists(oid)
 
-    def exists_prefix_cb(self, oid):
+    def exists_prefix_cb(self, oid: Oid | str) -> Oid:
         return self.source.exists_prefix(oid)
 
-    def refresh_cb(self):
+    def refresh_cb(self) -> None:
         self.source.refresh()
 
-    def __iter__(self):
+    def __iter__(self) -> Iterator[Oid]:
         return iter(self.source)
 
 
@@ -100,18 +102,18 @@ def __iter__(self):
 
 
 @pytest.fixture
-def proxy(barerepo):
+def proxy(barerepo: Repository) -> Generator[ProxyBackend, None, None]:
     path = Path(barerepo.path) / 'objects'
     yield ProxyBackend(pygit2.OdbBackendPack(path))
 
 
-def test_iterable(proxy):
+def test_iterable(proxy: ProxyBackend) -> None:
     assert BLOB_HEX in [o for o in proxy]
 
 
-def test_read(proxy):
+def test_read(proxy: ProxyBackend) -> None:
     with pytest.raises(TypeError):
-        proxy.read(123)
+        proxy.read(123)  # type: ignore
     utils.assertRaisesWithArg(KeyError, '1' * 40, proxy.read, '1' * 40)
 
     ab = proxy.read(BLOB_OID)
@@ -120,21 +122,21 @@ def test_read(proxy):
     assert (ObjectType.BLOB, b'a contents\n') == a
 
 
-def test_read_prefix(proxy):
+def test_read_prefix(proxy: ProxyBackend) -> None:
     a_hex_prefix = BLOB_HEX[:4]
     a3 = proxy.read_prefix(a_hex_prefix)
     assert (ObjectType.BLOB, b'a contents\n', BLOB_OID) == a3
 
 
-def test_exists(proxy):
+def test_exists(proxy: ProxyBackend) -> None:
     with pytest.raises(TypeError):
-        proxy.exists(123)
+        proxy.exists(123)  # type: ignore
 
     assert not proxy.exists('1' * 40)
     assert proxy.exists(BLOB_HEX)
 
 
-def test_exists_prefix(proxy):
+def test_exists_prefix(proxy: ProxyBackend) -> None:
     a_hex_prefix = BLOB_HEX[:4]
     assert BLOB_HEX == proxy.exists_prefix(a_hex_prefix)
 
@@ -145,22 +147,22 @@ def test_exists_prefix(proxy):
 
 
 @pytest.fixture
-def repo(barerepo):
+def repo(barerepo: Repository) -> Generator[Repository, None, None]:
     odb = pygit2.Odb()
 
     path = Path(barerepo.path) / 'objects'
-    backend = pygit2.OdbBackendPack(path)
-    backend = ProxyBackend(backend)
+    backend_org = pygit2.OdbBackendPack(path)
+    backend = ProxyBackend(backend_org)
     odb.add_backend(backend, 1)
 
     repo = pygit2.Repository()
     repo.set_odb(odb)
     yield repo
 
 
-def test_repo_read(repo):
+def test_repo_read(repo: Repository) -> None:
     with pytest.raises(TypeError):
-        repo[123]
+        repo[123]  # type: ignore
 
     utils.assertRaisesWithArg(KeyError, '1' * 40, repo.__getitem__, '1' * 40)