Fix more black warnings on test files

The changes are automatic linting fixes from black.
The target files are only those who test the new code.

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

Author: MVrachev

tests/test_api.py

@@ -28,6 +28,7 @@
 from tests import utils
 from tuf import exceptions
 from tuf.api.metadata import (
+    TOP_LEVEL_ROLE_NAMES,
     DelegatedRole,
     Delegations,
     Key,
@@ -136,7 +137,7 @@ def test_compact_json(self) -> None:
         )
 
     def test_read_write_read_compare(self) -> None:
-        for metadata in [Root.type, Snapshot.type, Timestamp.type, Targets.type]:
+        for metadata in TOP_LEVEL_ROLE_NAMES:
             path = os.path.join(self.repo_dir, "metadata", metadata + ".json")
             md_obj = Metadata.from_file(path)
 
@@ -148,7 +149,7 @@ def test_read_write_read_compare(self) -> None:
             os.remove(path_2)
 
     def test_to_from_bytes(self) -> None:
-        for metadata in [Root.type, Snapshot.type, Timestamp.type, Targets.type]:
+        for metadata in TOP_LEVEL_ROLE_NAMES:
             path = os.path.join(self.repo_dir, "metadata", metadata + ".json")
             with open(path, "rb") as f:
                 metadata_bytes = f.read()
@@ -710,7 +711,9 @@ def test_targetfile_from_file(self) -> None:
 
     def test_targetfile_from_data(self) -> None:
         data = b"Inline test content"
-        target_file_path = os.path.join(self.repo_dir, Targets.type, "file1.txt")
+        target_file_path = os.path.join(
+            self.repo_dir, Targets.type, "file1.txt"
+        )
 
         # Test with a valid hash algorithm
         targetfile_from_data = TargetFile.from_data(

tests/test_trusted_metadata_set.py

@@ -364,7 +364,9 @@ def snapshot_expired_modifier(snapshot: Snapshot) -> None:
             snapshot.expires = datetime(1970, 1, 1)
 
         # expired intermediate snapshot is loaded but will raise
-        snapshot = self.modify_metadata(Snapshot.type, snapshot_expired_modifier)
+        snapshot = self.modify_metadata(
+            Snapshot.type, snapshot_expired_modifier
+        )
         with self.assertRaises(exceptions.ExpiredMetadataError):
             self.trusted_set.update_snapshot(snapshot)
 
@@ -399,7 +401,9 @@ def no_meta_modifier(snapshot: Snapshot) -> None:
             snapshot.meta = {}
 
         snapshot = self.modify_metadata(Snapshot.type, no_meta_modifier)
-        self._update_all_besides_targets(self.metadata[Timestamp.type], snapshot)
+        self._update_all_besides_targets(
+            self.metadata[Timestamp.type], snapshot
+        )
         # remove meta information with information about targets from snapshot
         with self.assertRaises(exceptions.RepositoryError):
             self.trusted_set.update_targets(self.metadata[Targets.type])
@@ -410,7 +414,9 @@ def meta_length_modifier(snapshot: Snapshot) -> None:
                 snapshot.meta[metafile_path] = MetaFile(version=1, length=1)
 
         snapshot = self.modify_metadata(Snapshot.type, meta_length_modifier)
-        self._update_all_besides_targets(self.metadata[Timestamp.type], snapshot)
+        self._update_all_besides_targets(
+            self.metadata[Timestamp.type], snapshot
+        )
         # observed_hash != stored hash in snapshot meta for targets
         with self.assertRaises(exceptions.RepositoryError):
             self.trusted_set.update_targets(self.metadata[Targets.type])
@@ -421,7 +427,9 @@ def meta_modifier(snapshot: Snapshot) -> None:
                 snapshot.meta[metafile_path] = MetaFile(version=2)
 
         snapshot = self.modify_metadata(Snapshot.type, meta_modifier)
-        self._update_all_besides_targets(self.metadata[Timestamp.type], snapshot)
+        self._update_all_besides_targets(
+            self.metadata[Timestamp.type], snapshot
+        )
         # new_delegate.signed.version != meta.version stored in snapshot
         with self.assertRaises(exceptions.BadVersionNumberError):
             self.trusted_set.update_targets(self.metadata[Targets.type])

tests/test_updater_key_rotations.py

@@ -275,6 +275,7 @@ def test_non_root_rotations(self, md_version: MdVersion) -> None:
                 with self.assertRaises(expected_error):
                     self._run_refresh()
 
+
 if __name__ == "__main__":
     if "--dump" in sys.argv:
         TestUpdaterKeyRotations.dump_dir = tempfile.mkdtemp()

tests/test_updater_ng.py

@@ -19,7 +19,14 @@
 
 from tests import utils
 from tuf import exceptions, ngclient, unittest_toolbox
-from tuf.api.metadata import Metadata, Root, Snapshot, TargetFile, Targets, Timestamp
+from tuf.api.metadata import (
+    Metadata,
+    Root,
+    Snapshot,
+    TargetFile,
+    Targets,
+    Timestamp,
+)
 
 logger = logging.getLogger(__name__)
 
@@ -112,7 +119,7 @@ def setUp(self) -> None:
             + utils.TEST_HOST_ADDRESS
             + ":"
             + str(self.server_process_handler.port)
-            + repository_basepath.replace("\\","/")
+            + repository_basepath.replace("\\", "/")
         )
 
         self.metadata_url = f"{url_prefix}/metadata/"
@@ -180,17 +187,27 @@ def test_refresh_and_download(self) -> None:
 
         # top-level metadata is in local directory already
         self.updater.refresh()
-        self._assert_files([Root.type, Snapshot.type, Targets.type, Timestamp.type])
+        self._assert_files(
+            [Root.type, Snapshot.type, Targets.type, Timestamp.type]
+        )
 
         # Get targetinfos, assert that cache does not contain files
         info1 = self.updater.get_targetinfo("file1.txt")
         assert isinstance(info1, TargetFile)
-        self._assert_files([Root.type, Snapshot.type, Targets.type, Timestamp.type])
+        self._assert_files(
+            [Root.type, Snapshot.type, Targets.type, Timestamp.type]
+        )
 
         # Get targetinfo for 'file3.txt' listed in the delegated role1
         info3 = self.updater.get_targetinfo("file3.txt")
         assert isinstance(info3, TargetFile)
-        expected_files = ["role1", Root.type, Snapshot.type, Targets.type, Timestamp.type]
+        expected_files = [
+            "role1",
+            Root.type,
+            Snapshot.type,
+            Targets.type,
+            Timestamp.type,
+        ]
         self._assert_files(expected_files)
         self.assertIsNone(self.updater.find_cached_target(info1))
         self.assertIsNone(self.updater.find_cached_target(info3))
@@ -217,11 +234,19 @@ def test_refresh_with_only_local_root(self) -> None:
         self._assert_files([Root.type])
 
         self.updater.refresh()
-        self._assert_files([Root.type, Snapshot.type, Targets.type, Timestamp.type])
+        self._assert_files(
+            [Root.type, Snapshot.type, Targets.type, Timestamp.type]
+        )
 
         # Get targetinfo for 'file3.txt' listed in the delegated role1
         self.updater.get_targetinfo("file3.txt")
-        expected_files = ["role1", Root.type, Snapshot.type, Targets.type, Timestamp.type]
+        expected_files = [
+            "role1",
+            Root.type,
+            Snapshot.type,
+            Targets.type,
+            Timestamp.type,
+        ]
         self._assert_files(expected_files)
 
     def test_implicit_refresh_with_only_local_root(self) -> None:

tests/test_updater_top_level_update.py

@@ -14,7 +14,14 @@
 
 from tests import utils
 from tests.repository_simulator import RepositorySimulator
-from tuf.api.metadata import TOP_LEVEL_ROLE_NAMES, Metadata, Root, Snapshot, Targets, Timestamp
+from tuf.api.metadata import (
+    TOP_LEVEL_ROLE_NAMES,
+    Metadata,
+    Root,
+    Snapshot,
+    Targets,
+    Timestamp,
+)
 from tuf.exceptions import (
     BadVersionNumberError,
     ExpiredMetadataError,