Merge pull request #1373 from jku/remove-mirrors

experimental client: Remove mirrors

Author: Jussi Kukkonen

tests/test_updater_rework.py

@@ -123,14 +123,13 @@ def setUp(self):
     # directory copied from the original repository files.
     tuf.settings.repositories_directory = self.client_directory
 
-    self.repository_mirrors = {'mirror1': {'url_prefix': url_prefix,
-                                           'metadata_path': 'metadata',
-                                           'targets_path': 'targets'}}
-
+    metadata_url = f"{url_prefix}/metadata/"
+    targets_url = f"{url_prefix}/targets/"
     # Creating a repository instance.  The test cases will use this client
     # updater to refresh metadata, fetch target files, etc.
     self.repository_updater = updater.Updater(self.repository_name,
-                                              self.repository_mirrors)
+                                              metadata_url,
+                                              targets_url)
 
     # Metadata role keys are needed by the test cases to make changes to the
     # repository (e.g., adding a new target file to 'targets.json' and then

tuf/client_rework/download.py

@@ -138,9 +138,21 @@ def download_file(url, required_length, fetcher, strict_required_length=True):
         raise
 
     else:
+        temp_file.seek(0)
         return temp_file
 
 
+def download_bytes(url, required_length, fetcher, strict_required_length=True):
+    """Download bytes from given url
+
+    Returns the downloaded bytes, otherwise like download_file()
+    """
+    with download_file(
+        url, required_length, fetcher, strict_required_length
+    ) as dl_file:
+        return dl_file.read()
+
+
 def _check_downloaded_length(
     total_downloaded,
     required_length,