Address more mypy warnings on tests files

All of the changes are made manual.
The target files are only those who test the new code.

Signed-off-by: Martin Vrachev <[email protected]>

Author: MVrachev

tests/test_examples.py

@@ -10,6 +10,7 @@
 import tempfile
 import unittest
 from pathlib import Path
+from typing import ClassVar, List
 
 
 class TestRepoExamples(unittest.TestCase):
@@ -20,26 +21,30 @@ class TestRepoExamples(unittest.TestCase):
 
     """
 
+    repo_examples_dir: ClassVar[Path]
+
     @classmethod
-    def setUpClass(cls):
+    def setUpClass(cls) -> None:
         """Locate and cache 'repo_example' dir."""
         base = Path(__file__).resolve().parents[1]
         cls.repo_examples_dir = base / "examples" / "repo_example"
 
-    def setUp(self):
+    def setUp(self) -> None:
         """Create and change into test dir.
         NOTE: Test scripts are expected to create dirs/files in new CWD."""
         self.original_cwd = os.getcwd()
         self.base_test_dir = os.path.realpath(tempfile.mkdtemp())
         os.chdir(self.base_test_dir)
 
-    def tearDown(self):
+    def tearDown(self) -> None:
         """Change back to original dir and remove test dir, which may contain
         dirs/files the test created at test-time CWD."""
         os.chdir(self.original_cwd)
         shutil.rmtree(self.base_test_dir)
 
-    def _run_script_and_assert_files(self, script_name, filenames_created):
+    def _run_script_and_assert_files(
+        self, script_name: str, filenames_created: List[str]
+    ) -> None:
         """Run script in 'repo_example' dir and assert that it created the
         files corresponding to the passed filenames inside a 'tmp*' test dir at
         CWD."""
@@ -63,7 +68,7 @@ def _run_script_and_assert_files(self, script_name, filenames_created):
                 metadata_path.exists(), f"missing '{metadata_path}' file"
             )
 
-    def test_basic_repo(self):
+    def test_basic_repo(self) -> None:
         """Run 'basic_repo.py' and assert creation of metadata files."""
         self._run_script_and_assert_files(
             "basic_repo.py",

tests/test_updater_consistent_snapshot.py

@@ -17,6 +17,7 @@
 from tuf.api.metadata import (
     SPECIFICATION_VERSION,
     TOP_LEVEL_ROLE_NAMES,
+    TargetFile,
     Targets,
 )
 from tuf.ngclient import Updater
@@ -109,7 +110,9 @@ def _assert_targets_files_exist(self, filenames: Iterable[str]) -> None:
     }
 
     @utils.run_sub_tests_with_dataset(top_level_roles_data)
-    def test_top_level_roles_update(self, test_case_data: Dict[str, Any]):
+    def test_top_level_roles_update(
+        self, test_case_data: Dict[str, Any]
+    ) -> None:
         # Test if the client fetches and stores metadata files with the
         # correct version prefix, depending on 'consistent_snapshot' config
         consistent_snapshot: bool = test_case_data["consistent_snapshot"]
@@ -143,7 +146,9 @@ def test_top_level_roles_update(self, test_case_data: Dict[str, Any]):
     }
 
     @utils.run_sub_tests_with_dataset(delegated_roles_data)
-    def test_delegated_roles_update(self, test_case_data: Dict[str, Any]):
+    def test_delegated_roles_update(
+        self, test_case_data: Dict[str, Any]
+    ) -> None:
         # Test if the client fetches and stores delegated metadata files with
         # the correct version prefix, depending on 'consistent_snapshot' config
         consistent_snapshot: bool = test_case_data["consistent_snapshot"]
@@ -193,7 +198,7 @@ def test_delegated_roles_update(self, test_case_data: Dict[str, Any]):
     }
 
     @utils.run_sub_tests_with_dataset(targets_download_data)
-    def test_download_targets(self, test_case_data: Dict[str, Any]):
+    def test_download_targets(self, test_case_data: Dict[str, Any]) -> None:
         # Test if the client fetches and stores target files with
         # the correct hash prefix, depending on 'consistent_snapshot'
         # and 'prefix_targets_with_hash' config
@@ -220,6 +225,7 @@ def test_download_targets(self, test_case_data: Dict[str, Any]):
 
             for targetpath in targetpaths:
                 info = updater.get_targetinfo(targetpath)
+                assert isinstance(info, TargetFile)
                 updater.download_target(info)
                 expected_prefix = (
                     None if not hash_algo else info.hashes[hash_algo]