Madiator2011/lbry-sdk
1
0
Fork 0
forked from LBRYCommunity/lbry-sdk
Code Pull requests Activity

fix blobmanager tests and dont run conf tests

Browse source
This commit is contained in:
Lex Berezhny 2019-01-07 10:47:35 -05:00
parent 4bb8129bb7
commit b5340505e5
3 changed files with 11 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.travis.yml
View file

@ -24,7 +24,7 @@ jobs:
- pip install git+https://github.com/lbryio/torba.git#egg=torba - pip install git+https://github.com/lbryio/torba.git#egg=torba
- pip install -e .[test] - pip install -e .[test]
script: script:
- HOME=/tmp coverage run -p --source=lbrynet -m twisted.trial --reactor=asyncio tests.unit.analytics tests.unit.core tests.unit.cryptstream tests.unit.database tests.unit.dht tests.unit.lbryfilemanager tests.unit.lbrynet_daemon tests.unit.schema tests.unit.wallet tests.unit.test_conf tests.unit.test_customLogger tests.unit.components - HOME=/tmp coverage run -p --source=lbrynet -m twisted.trial --reactor=asyncio tests.unit.analytics tests.unit.core tests.unit.cryptstream tests.unit.database tests.unit.dht tests.unit.lbryfilemanager tests.unit.lbrynet_daemon tests.unit.schema tests.unit.wallet tests.unit.test_customLogger tests.unit.components
- HOME=/tmp coverage run -p --source=lbrynet -m twisted.trial --reactor=asyncio tests.unit.test_cli - HOME=/tmp coverage run -p --source=lbrynet -m twisted.trial --reactor=asyncio tests.unit.test_cli
after_success: after_success:
- coverage combine - coverage combine

18
lbrynet/blob/blob_file.py
View file

@ -111,23 +111,13 @@ class BlobFile:
if not self.writers and not self.readers: if not self.writers and not self.readers:
self._verified = False self._verified = False
self.saved_verified_blob = False self.saved_verified_blob = False
try:
#def delete_from_file_system():
if os.path.isfile(self.file_path): if os.path.isfile(self.file_path):
os.remove(self.file_path) os.remove(self.file_path)
except Exception as e:
#d = threads.deferToThread(delete_from_file_system) log.exception("An error occurred deleting %s:", str(self.file_path), exc_info=e)
def log_error(err):
log.warning("An error occurred deleting %s: %s",
str(self.file_path), err.getErrorMessage())
return err
#d.addErrback(log_error)
return #d
else: else:
return defer.fail(Failure( raise ValueError("File is currently being read or written and cannot be deleted")
ValueError("File is currently being read or written and cannot be deleted")))
@property @property
def verified(self): def verified(self):

7
tests/unit/core/test_BlobManager.py
View file

@ -97,6 +97,7 @@ class BlobManagerTest(unittest.TestCase):
# Test that a blob that is opened for writing will not be deleted # Test that a blob that is opened for writing will not be deleted
# create blobs # create blobs
blob_hash = None
blob_hashes = [] blob_hashes = []
for i in range(0, 10): for i in range(0, 10):
blob_hash = yield self._create_and_add_blob() blob_hash = yield self._create_and_add_blob()
@ -105,11 +106,11 @@ class BlobManagerTest(unittest.TestCase):
self.assertEqual(len(blobs), 10) self.assertEqual(len(blobs), 10)
# open the last blob # open the last blob
blob = yield self.bm.get_blob(blob_hashes[-1]) blob = self.bm.get_blob(blob_hashes[-1])
w, finished_d = yield blob.open_for_writing(self.peer) w, finished_d = blob.open_for_writing(self.peer)
# schedule a close, just to leave the reactor clean # schedule a close, just to leave the reactor clean
finished_d.addBoth(lambda x:None) finished_d.addBoth(lambda x: None)
self.addCleanup(w.close) self.addCleanup(w.close)
# delete the last blob and check if it still exists # delete the last blob and check if it still exists