oci/zeronet
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Don't retry bad files also in big file tests

Browse source
This commit is contained in:
shortcutme 2019-12-21 03:21:38 +01:00
parent 48124e12d9
commit 3d73599deb
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
plugins/Bigfile/Test/TestBigfile.py
View file

@ -134,7 +134,7 @@ class TestBigfile:
peer_client = site_temp.addPeer(file_server.ip, 1544) peer_client = site_temp.addPeer(file_server.ip, 1544)
# Download site # Download site
site_temp.download(blind_includes=True).join(timeout=5) site_temp.download(blind_includes=True, retry_bad_files=False).join(timeout=10)
bad_files = site_temp.storage.verifyFiles(quick_check=True)["bad_files"] bad_files = site_temp.storage.verifyFiles(quick_check=True)["bad_files"]
assert not bad_files assert not bad_files
@ -172,7 +172,7 @@ class TestBigfile:
site_temp.addPeer(file_server.ip, 1544) site_temp.addPeer(file_server.ip, 1544)
# Download site # Download site
site_temp.download(blind_includes=True).join(timeout=5) site_temp.download(blind_includes=True, retry_bad_files=False).join(timeout=10)
# Open virtual file # Open virtual file
assert not site_temp.storage.isFile(inner_path) assert not site_temp.storage.isFile(inner_path)
@ -255,7 +255,7 @@ class TestBigfile:
site_temp.addPeer(file_server.ip, 1544) site_temp.addPeer(file_server.ip, 1544)
# Download site # Download site
site_temp.download(blind_includes=True).join(timeout=5) site_temp.download(blind_includes=True, retry_bad_files=False).join(timeout=10)
# Download second block # Download second block
with site_temp.storage.openBigfile(inner_path) as f: with site_temp.storage.openBigfile(inner_path) as f:
@ -380,7 +380,7 @@ class TestBigfile:
site_temp.addPeer(file_server.ip, 1544) site_temp.addPeer(file_server.ip, 1544)
# Download site # Download site
site_temp.download(blind_includes=True).join(timeout=5) site_temp.download(blind_includes=True, retry_bad_files=False).join(timeout=10)
# Open virtual file # Open virtual file
assert not site_temp.storage.isFile(inner_path) assert not site_temp.storage.isFile(inner_path)
@ -417,7 +417,7 @@ class TestBigfile:
site_temp.addPeer(file_server.ip, 1544) site_temp.addPeer(file_server.ip, 1544)
# Download site # Download site
site_temp.download(blind_includes=True).join(timeout=5) site_temp.download(blind_includes=True, retry_bad_files=False).join(timeout=10)
# Open virtual file # Open virtual file
assert not site_temp.storage.isFile(inner_path) assert not site_temp.storage.isFile(inner_path)
@ -453,7 +453,7 @@ class TestBigfile:
site_temp.addPeer(file_server.ip, 1544) site_temp.addPeer(file_server.ip, 1544)
# Download site # Download site
site_temp.download(blind_includes=True).join(timeout=5) site_temp.download(blind_includes=True, retry_bad_files=False).join(timeout=10)
# Open virtual file # Open virtual file
assert not site_temp.storage.isFile(inner_path) assert not site_temp.storage.isFile(inner_path)
@ -482,7 +482,7 @@ class TestBigfile:
site_temp.addPeer(file_server.ip, 1544) site_temp.addPeer(file_server.ip, 1544)
# Download site # Download site
site_temp.download(blind_includes=True).join(timeout=5) site_temp.download(blind_includes=True, retry_bad_files=False).join(timeout=10)
# Open virtual file # Open virtual file
assert not site_temp.storage.isFile(inner_path) assert not site_temp.storage.isFile(inner_path)
@ -507,7 +507,7 @@ class TestBigfile:
site_temp.addPeer(file_server.ip, 1544) site_temp.addPeer(file_server.ip, 1544)
# Download site # Download site
site_temp.download(blind_includes=True).join(timeout=5) site_temp.download(blind_includes=True, retry_bad_files=False).join(timeout=10)
with Spy.Spy(FileRequest, "route") as requests: with Spy.Spy(FileRequest, "route") as requests:
site_temp.needFile("%s|%s-%s" % (inner_path, 0, 1 * self.piece_size)) site_temp.needFile("%s|%s-%s" % (inner_path, 0, 1 * self.piece_size))
@ -529,7 +529,7 @@ class TestBigfile:
with Spy.Spy(FileRequest, "route") as requests: with Spy.Spy(FileRequest, "route") as requests:
site.publish() site.publish()
time.sleep(0.1) time.sleep(0.1)
site_temp.download(blind_includes=True).join(timeout=5) # Wait for download site_temp.download(blind_includes=True, retry_bad_files=False).join(timeout=10) # Wait for download
assert len([req[1] for req in requests if req[1] == "streamFile"]) == 0 assert len([req[1] for req in requests if req[1] == "streamFile"]) == 0
@ -563,7 +563,7 @@ class TestBigfile:
site_temp.addPeer(file_server.ip, 1544) site_temp.addPeer(file_server.ip, 1544)
# Download site # Download site
site_temp.download(blind_includes=True).join(timeout=5) site_temp.download(blind_includes=True, retry_bad_files=False).join(timeout=10)
if "piecemap" in site.content_manager.getFileInfo(inner_path): # Bigfile if "piecemap" in site.content_manager.getFileInfo(inner_path): # Bigfile
site_temp.needFile(inner_path + "|all") site_temp.needFile(inner_path + "|all")