Merge pull request #1695 from ivanayov/repository_simulator_inconsistent_metafile_hashes

Fix inconsistent behaviour of compute_metafile_hashes_length

Author: Jussi Kukkonen

tests/repository_simulator.py

@@ -294,12 +294,15 @@ def update_timestamp(self) -> None:
         """Update timestamp and assign snapshot version to snapshot_meta
         version.
         """
-        self.timestamp.snapshot_meta.version = self.snapshot.version
 
+        hashes = None
+        length = None
         if self.compute_metafile_hashes_length:
             hashes, length = self._compute_hashes_and_length(Snapshot.type)
-            self.timestamp.snapshot_meta.hashes = hashes
-            self.timestamp.snapshot_meta.length = length
+
+        self.timestamp.snapshot_meta = MetaFile(
+            self.snapshot.version, length, hashes
+        )
 
         self.timestamp.version += 1
 

tests/test_updater_top_level_update.py

@@ -434,6 +434,20 @@ def test_new_targets_expired(self) -> None:
 
         self._assert_files_exist([Root.type, Timestamp.type, Snapshot.type])
 
+    def test_compute_metafile_hashes_length(self) -> None:
+        self.sim.compute_metafile_hashes_length = True
+        self.sim.update_snapshot()
+        self._run_refresh()
+        self._assert_version_equals("timestamp", 2)
+        self._assert_version_equals("snapshot", 2)
+
+        self.sim.compute_metafile_hashes_length = False
+        self.sim.update_snapshot()
+        self._run_refresh()
+
+        self._assert_version_equals("timestamp", 3)
+        self._assert_version_equals("snapshot", 3)
+
 
 if __name__ == "__main__":