diff --git a/test/service/test_manifest.py b/test/service/test_manifest.py index 592a131f6..1e197676c 100644 --- a/test/service/test_manifest.py +++ b/test/service/test_manifest.py @@ -2044,20 +2044,24 @@ def test_jsonl_manifest(self): response = self._get_manifest(ManifestFormat.verbatim_jsonl, filters={}) self.assertEqual(200, response.status_code) manifest = [ - json.loads(row)['contents'] + json.loads(row) for row in response.content.decode().splitlines() ] expected = [ - entity + { + 'type': 'anvil_' + entity_ref.entity_type, + 'contents': entity, + } for bundle in self.bundles() - for entity in self._load_canned_bundle(bundle).entities.values() + for entity_ref, entity in self._load_canned_bundle(bundle).entities.items() ] def sort_key(anvil_doc): + contents = anvil_doc['contents'] try: - return anvil_doc['datarepo_row_id'] + return contents['datarepo_row_id'] except KeyError: - return anvil_doc['description'] + return contents['description'] manifest.sort(key=sort_key) expected.sort(key=sort_key)