diff --git a/tests/mocks.py b/tests/mocks.py index bfd699d7a..7a312350f 100644 --- a/tests/mocks.py +++ b/tests/mocks.py @@ -495,6 +495,7 @@ create_stream_sd_file = { def mock_conf_settings(obj, settings={}): + conf.settings = None settings.setdefault('download_mirrors', []) conf.initialize_settings(False) original_settings = conf.settings diff --git a/tests/unit/core/test_BlobManager.py b/tests/unit/core/test_BlobManager.py index 327fd7f42..f39edaadb 100644 --- a/tests/unit/core/test_BlobManager.py +++ b/tests/unit/core/test_BlobManager.py @@ -106,7 +106,11 @@ class BlobManagerTest(unittest.TestCase): # open the last blob blob = yield self.bm.get_blob(blob_hashes[-1]) - yield blob.open_for_writing(self.peer) + w, finished_d = yield blob.open_for_writing(self.peer) + + # schedule a close, just to leave the reactor clean + finished_d.addBoth(lambda x:None) + self.addCleanup(w.close) # delete the last blob and check if it still exists yield self.bm.delete_blobs([blob_hash]) diff --git a/tests/unit/core/test_HashBlob.py b/tests/unit/core/test_HashBlob.py index c8b595a80..157be38a2 100644 --- a/tests/unit/core/test_HashBlob.py +++ b/tests/unit/core/test_HashBlob.py @@ -154,3 +154,8 @@ class BlobFileTest(unittest.TestCase): # second write should fail to save yield self.assertFailure(blob_file.save_verified_blob(writer_2), DownloadCanceledError) + # schedule a close, just to leave the reactor clean + finished_d_1.addBoth(lambda x:None) + finished_d_2.addBoth(lambda x:None) + self.addCleanup(writer_1.close) + self.addCleanup(writer_2.close) diff --git a/tests/unit/dht/test_hash_announcer.py b/tests/unit/dht/test_hash_announcer.py index 78ddc7eb5..5b6d954a0 100644 --- a/tests/unit/dht/test_hash_announcer.py +++ b/tests/unit/dht/test_hash_announcer.py @@ -4,6 +4,7 @@ from lbrynet import conf from lbrynet.core import utils from lbrynet.dht.hashannouncer import DHTHashAnnouncer from tests.util import random_lbry_hash +from tests.mocks import mock_conf_settings class MocDHTNode(object): @@ -38,7 +39,7 @@ class MocStorage(object): class DHTHashAnnouncerTest(unittest.TestCase): def setUp(self): - conf.initialize_settings(False) + mock_conf_settings(self) self.num_blobs = 10 self.blobs_to_announce = [] for i in range(0, self.num_blobs):