Merge pull request #1954 from aribasch/fix-path-construction

Replaced manual path construction with os.path.join

Author: Lukas Pühringer

tests/test_api.py

@@ -134,7 +134,9 @@ def test_md_read_write_file_exceptions(self) -> None:
 
         # Test serializing to a file with bad filename
         with self.assertRaises(exceptions.StorageError):
-            md = Metadata.from_file(f"{self.repo_dir}/metadata/root.json")
+            md = Metadata.from_file(
+                os.path.join(self.repo_dir, "metadata", "root.json")
+            )
             md.to_file("")
 
     def test_compact_json(self) -> None:
@@ -159,7 +161,9 @@ def test_read_write_read_compare(self) -> None:
 
     def test_serialize_with_validate(self) -> None:
         # Assert that by changing one required attribute validation will fail.
-        root = Metadata.from_file(f"{self.repo_dir}/metadata/root.json")
+        root = Metadata.from_file(
+            os.path.join(self.repo_dir, "metadata", "root.json")
+        )
         root.signed.version = 0
         with self.assertRaises(SerializationError):
             root.to_bytes(JSONSerializer(validate=True))
@@ -233,7 +237,9 @@ def test_sign_verify(self) -> None:
     def test_sign_failures(self) -> None:
         # Test throwing UnsignedMetadataError because of signing problems
         # related to bad information in the signer.
-        md = Metadata.from_file(f"{self.repo_dir}/metadata/snapshot.json")
+        md = Metadata.from_file(
+            os.path.join(self.repo_dir, "metadata", "snapshot.json")
+        )
         key_dict = copy(self.keystore[Snapshot.type])
         key_dict["keytype"] = "rsa"
         key_dict["scheme"] = "bad_scheme"

tests/test_updater_top_level_update.py

@@ -774,7 +774,9 @@ def test_expired_metadata(self, mock_time: Mock) -> None:
         # which means a successful refresh is performed
         # with expired local metadata
         for role in ["timestamp", "snapshot", "targets"]:
-            md = Metadata.from_file(f"{self.metadata_dir}/{role}.json")
+            md = Metadata.from_file(
+                os.path.join(self.metadata_dir, f"{role}.json")
+            )
             self.assertEqual(md.signed.version, 2)