fixup! Refactor test_hash_validity()

Author: dsotirho-ucsc

test/service/test_manifest.py

@@ -1050,21 +1050,22 @@ def test_hash_validity_with_notifications_enabled(self) -> None:
 
     def _test_hash_validity(self):
         self.maxDiff = None
-        project1 = '67bc798b-a34a-4104-8cab-cad648471f69'
-        project2 = '6615efae-fca8-4dd2-a223-9cfcf30fe94d'
-        project3 = '091cf39b-01bc-42e5-9437-f419a66c8a45'
-        bundles = {
-            project1: self.bundle_fqid(uuid='f79257a7-dfc6-46d6-ae00-ba4b25313c10',
-                                       version='2018-09-14T13:33:14.453337Z'),
-            project2: self.bundle_fqid(uuid='587d74b4-1075-4bbf-b96a-4d1ede0481b2',
-                                       version='2018-09-14T13:33:14.453337Z'),
-            project3: self.bundle_fqid(uuid='cfab8304-dc9f-439e-af29-f8eb75b0729d',
-                                       version='2019-07-18T21:28:20.595913Z'),
+        bundles_by_project = {
+            '67bc798b-a34a-4104-8cab-cad648471f69':
+                self.bundle_fqid(uuid='f79257a7-dfc6-46d6-ae00-ba4b25313c10',
+                                 version='2018-09-14T13:33:14.453337Z'),
+            '6615efae-fca8-4dd2-a223-9cfcf30fe94d':
+                self.bundle_fqid(uuid='587d74b4-1075-4bbf-b96a-4d1ede0481b2',
+                                 version='2018-09-14T13:33:14.453337Z'),
+            '091cf39b-01bc-42e5-9437-f419a66c8a45':
+                self.bundle_fqid(uuid='cfab8304-dc9f-439e-af29-f8eb75b0729d',
+                                 version='2019-07-18T21:28:20.595913Z'),
         }
-        self._index_canned_bundle(bundles[project1])
+        projects, bundles = zip(*bundles_by_project.items())
+        self._index_canned_bundle(bundles[0])
         filters = self._filters(cast(FiltersJSON, {
             'projectId': {
-                'is': [project1, project2]
+                'is': [projects[0], projects[1]]
             }
         }))
         service = ManifestService(self.storage_service, self.app_module.app.file_url)
@@ -1073,37 +1074,35 @@ def manifest_generator(format: ManifestFormat) -> ManifestGenerator:
             generator_cls = ManifestGenerator.cls_for_format(format)
             return generator_cls(service, self.catalog, filters)
 
-        keys = {}
+        keys = [{}, {}]
 
         for format in ManifestFormat:
             with self.subTest('First bundle indexed', format=format):
-                # When a new bundle is indexed and its compact manifest cached,
-                # a matching manifest key is generated ...
+                # A manifest for a filter matching files in the first bundle …
                 generator = manifest_generator(format)
                 manifest_key = generator.manifest_key()
-                # and should remain valid ...
+                # … should remain cached …
                 self.assertEqual(manifest_key, generator.manifest_key())
-                keys[(1, format)] = manifest_key
+                keys[0][format] = manifest_key
 
-        # ... until a new bundle that will match the filter is indexed, at
-        # which point a manifest request will generate a different key ...
-        self._index_canned_bundle(bundles[project2])
+        # … until a new bundle with files also matching the filter is indexed.
+        self._index_canned_bundle(bundles[1])
         for format in ManifestFormat:
             with self.subTest('Second bundle indexed', format=format):
                 generator = manifest_generator(format)
                 manifest_key = generator.manifest_key()
-                # ... invalidating the cached object previously used for the same filter.
-                self.assertNotEqual(keys[(1, format)], manifest_key)
-                keys[(2, format)] = manifest_key
+                # The updated manifest is cached under a different key.
+                self.assertNotEqual(keys[0][format], manifest_key)
+                keys[1][format] = manifest_key
 
-        # Updates or additions, unrelated to that project do not affect object
-        # key generation
-        self._index_canned_bundle(bundles[project3])
+        # After indexing a bundle with files that don't match the filter, the
+        # cached manifest remains valid.
+        self._index_canned_bundle(bundles[2])
         for format in ManifestFormat:
             with self.subTest('Unrelated bundle indexed', format=format):
                 generator = manifest_generator(format)
                 manifest_key = generator.manifest_key()
-                self.assertEqual(keys[(2, format)], manifest_key)
+                self.assertEqual(keys[1][format], manifest_key)
 
     @patch.object(StorageService, '_time_until_object_expires')
     def test_get_cached_manifest(self, _time_until_object_expires: MagicMock):