Address more pylint 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_updater_consistent_snapshot.py

@@ -28,6 +28,7 @@ class TestConsistentSnapshot(unittest.TestCase):
     are formed for each combination"""
 
     def setUp(self) -> None:
+        # pylint: disable=consider-using-with
         self.temp_dir = tempfile.TemporaryDirectory()
         self.metadata_dir = os.path.join(self.temp_dir.name, "metadata")
         self.targets_dir = os.path.join(self.temp_dir.name, "targets")
@@ -117,6 +118,7 @@ def test_top_level_roles_update(self, test_case_data: Dict[str, Any]):
         sim = self._init_repo(consistent_snapshot)
         updater = self._init_updater(sim)
 
+        # pylint: disable=protected-access
         with patch.object(
             sim, "_fetch_metadata", wraps=sim._fetch_metadata
         ) as wrapped_fetch:
@@ -159,6 +161,7 @@ def test_delegated_roles_update(self, test_case_data: Dict[str, Any]):
         updater = self._init_updater(sim)
         updater.refresh()
 
+        # pylint: disable=protected-access
         with patch.object(
             sim, "_fetch_metadata", wraps=sim._fetch_metadata
         ) as wrapped_fetch:
@@ -210,6 +213,7 @@ def test_download_targets(self, test_case_data: Dict[str, Any]):
         updater.config.prefix_targets_with_hash = prefix_targets_with_hash
         updater.refresh()
 
+        # pylint: disable=protected-access
         with patch.object(
             sim, "_fetch_target", wraps=sim._fetch_target
         ) as wrapped_fetch_target:

tests/test_updater_ng.py

@@ -48,14 +48,14 @@ def setUpClass(cls) -> None:
         # Needed because in some tests simple_server.py cannot be found.
         # The reason is that the current working directory
         # has been changed when executing a subprocess.
-        SIMPLE_SERVER_PATH = os.path.join(os.getcwd(), "simple_server.py")
+        simple_server_path = os.path.join(os.getcwd(), "simple_server.py")
 
         # Launch a SimpleHTTPServer (serves files in the current directory).
         # Test cases will request metadata and target files that have been
         # pre-generated in 'tuf/tests/repository_data', which will be served
         # by the SimpleHTTPServer launched here.
         cls.server_process_handler = utils.TestServerProcess(
-            log=logger, server=SIMPLE_SERVER_PATH
+            log=logger, server=simple_server_path
         )
 
     @classmethod
@@ -259,7 +259,7 @@ def test_implicit_refresh_with_only_local_root(self) -> None:
         self._assert_files(["root"])
 
         # Get targetinfo for 'file3.txt' listed in the delegated role1
-        targetinfo3 = self.updater.get_targetinfo("file3.txt")
+        self.updater.get_targetinfo("file3.txt")
         expected_files = ["role1", "root", "snapshot", "targets", "timestamp"]
         self._assert_files(expected_files)
 

tests/test_updater_top_level_update.py

@@ -40,6 +40,7 @@ class TestRefresh(unittest.TestCase):
     past_datetime = datetime.utcnow().replace(microsecond=0) - timedelta(days=5)
 
     def setUp(self) -> None:
+        # pylint: disable=consider-using-with
         self.temp_dir = tempfile.TemporaryDirectory()
         self.metadata_dir = os.path.join(self.temp_dir.name, "metadata")
         self.targets_dir = os.path.join(self.temp_dir.name, "targets")

tests/test_updater_with_simulator.py

@@ -12,11 +12,11 @@
 import tempfile
 import unittest
 from typing import Optional, Tuple
-from unittest.mock import MagicMock, Mock, patch
+from unittest.mock import MagicMock, patch
 
 from tests import utils
 from tests.repository_simulator import RepositorySimulator
-from tuf.api.metadata import SPECIFICATION_VERSION, TargetFile, Targets
+from tuf.api.metadata import SPECIFICATION_VERSION, Targets
 from tuf.exceptions import BadVersionNumberError, UnsignedMetadataError
 from tuf.ngclient import Updater
 

tests/utils.py

@@ -220,6 +220,7 @@ def _start_process(self, extra_cmd_args: List[str], popen_cwd: str) -> None:
 
         # Reusing one subprocess in multiple tests, but split up the logs
         # for each.
+        # pylint: disable=consider-using-with
         self.__server_process = subprocess.Popen(
             command,
             stdout=subprocess.PIPE,