From 03db114ba8f8a50d370177f75e72e55772d1ab31 Mon Sep 17 00:00:00 2001 From: Kay Kurokawa Date: Tue, 4 Jul 2017 17:22:39 -0400 Subject: [PATCH] fix test_BlobManager race condition --- tests/unit/core/test_BlobManager.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/unit/core/test_BlobManager.py b/tests/unit/core/test_BlobManager.py index d7cb41889..2ddc812e2 100644 --- a/tests/unit/core/test_BlobManager.py +++ b/tests/unit/core/test_BlobManager.py @@ -24,7 +24,10 @@ class BlobManagerTest(unittest.TestCase): def tearDown(self): self.bm.stop() - shutil.rmtree(self.blob_dir) + # BlobFile will try to delete itself in _close_writer + # thus when calling rmtree we may get a FileNotFoundError + # for the blob file + shutil.rmtree(self.blob_dir, ignore_errors=True) shutil.rmtree(self.db_dir) @defer.inlineCallbacks @@ -109,5 +112,4 @@ class BlobManagerTest(unittest.TestCase): self.assertTrue(blob_hashes[-1] in blobs) self.assertTrue(os.path.isfile(os.path.join(self.blob_dir,blob_hashes[-1]))) - blob._close_writer(blob.writers[self.peer][0])