diff --git a/lbrynet/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py b/lbrynet/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py index 4ebf36f4f..05c0a8feb 100644 --- a/lbrynet/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py +++ b/lbrynet/tests/unit/lbryfilemanager/test_EncryptedFileCreator.py @@ -5,6 +5,7 @@ from twisted.trial import unittest from twisted.internet import defer from lbrynet.database.storage import SQLiteStorage +from lbrynet.core.StreamDescriptor import get_sd_info, BlobStreamDescriptorReader from lbrynet.core import BlobManager from lbrynet.core import Session from lbrynet.core.server import DHTHashAnnouncer @@ -15,6 +16,7 @@ from lbrynet.tests.util import mk_db_and_blob_dir, rm_db_and_blob_dir MB = 2**20 + def iv_generator(): while True: yield '3' * AES.block_size @@ -22,6 +24,7 @@ def iv_generator(): class CreateEncryptedFileTest(unittest.TestCase): timeout = 5 + @defer.inlineCallbacks def setUp(self): mocks.mock_conf_settings(self) @@ -57,16 +60,28 @@ class CreateEncryptedFileTest(unittest.TestCase): def test_can_create_file(self): expected_stream_hash = "41e6b247d923d191b154fb6f1b8529d6ddd6a73d65c35" \ "7b1acb742dd83151fb66393a7709e9f346260a4f4db6de10c25" - expected_sd_hash = "bc435ae0c4659635e6514e05bb1fcd0d365b234f6f0e78002" \ - "d2576ff84a0b8710a9847757a9aa8cbeda5a8e1aeafa48b" + expected_sd_hash = "db043b44384c149126685990f6bb6563aa565ae331303d522" \ + "c8728fe0534dd06fbcacae92b0891787ad9b68ffc8d20c1" filename = 'test.file' lbry_file = yield self.create_file(filename) sd_hash = yield self.session.storage.get_sd_blob_hash_for_stream(lbry_file.stream_hash) + # read the sd blob file + sd_blob = self.blob_manager.blobs[sd_hash] + sd_reader = BlobStreamDescriptorReader(sd_blob) + sd_file_info = yield sd_reader.get_info() + + # this comes from the database, the blobs returned are sorted + sd_info = yield get_sd_info(self.session.storage, lbry_file.stream_hash, include_blobs=True) + self.assertDictEqual(sd_info, sd_file_info) + self.assertEqual(sd_info['stream_hash'], expected_stream_hash) + self.assertEqual(len(sd_info['blobs']), 3) + self.assertNotEqual(sd_info['blobs'][0]['length'], 0) + self.assertNotEqual(sd_info['blobs'][1]['length'], 0) + self.assertEqual(sd_info['blobs'][2]['length'], 0) self.assertEqual(expected_stream_hash, lbry_file.stream_hash) self.assertEqual(sd_hash, lbry_file.sd_hash) self.assertEqual(sd_hash, expected_sd_hash) - blobs = yield self.blob_manager.get_all_verified_blobs() self.assertEqual(3, len(blobs)) num_should_announce_blobs = yield self.blob_manager.count_should_announce_blobs()