Reverted URL construction back to f-strings

Signed-off-by: Ari <aribasch@umich.edu>

Author: aribasch

tests/test_fetcher_ng.py

@@ -50,7 +50,7 @@ def setUpClass(cls) -> None:
             f"{str(cls.server_process_handler.port)}"
         )
         target_filename = os.path.basename(cls.target_file.name)
-        cls.url = os.path.join(cls.url_prefix, target_filename)
+        cls.url = f"{cls.url_prefix}/{target_filename}"
 
     @classmethod
     def tearDownClass(cls) -> None:
@@ -102,7 +102,7 @@ def test_url_parsing(self) -> None:
     # File not found error
     def test_http_error(self) -> None:
         with self.assertRaises(exceptions.DownloadHTTPError) as cm:
-            self.url = os.path.join(self.url_prefix, "non-existing-path")
+            self.url = f"{self.url_prefix}/non-existing-path"
             self.fetcher.fetch(self.url)
         self.assertEqual(cm.exception.status_code, 404)
 

tests/test_updater_ng.py

@@ -104,8 +104,8 @@ def setUp(self) -> None:
             + repository_basepath.replace("\\", "/")
         )
 
-        self.metadata_url = os.path.join(url_prefix, "metadata", "")
-        self.targets_url = os.path.join(url_prefix, "targets", "")
+        self.metadata_url = f"{url_prefix}/metadata/"
+        self.targets_url = f"{url_prefix}/targets/"
         self.dl_dir = tempfile.mkdtemp(dir=self.tmp_test_dir)
         # Creating a repository instance.  The test cases will use this client
         # updater to refresh metadata, fetch target files, etc.