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

Bigfile test formatting fix

Browse source
This commit is contained in:
shortcutme 2018-07-16 01:55:41 +02:00
parent 0de16855b0
commit 2f57e9cbee
No known key found for this signature in database
GPG key ID: 5B63BAE6CB9613AE
1 changed files with 4 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,11 +1,9 @@
import time import time
import os
from cStringIO import StringIO from cStringIO import StringIO
import pytest import pytest
import msgpack import msgpack
import mock import mock
from lib import merkletools
from Connection import ConnectionServer from Connection import ConnectionServer
from Content.ContentManager import VerifyError from Content.ContentManager import VerifyError
@ -218,8 +216,6 @@ class TestBigfile:
data = f.read(1024 * 1024 * 30) data = f.read(1024 * 1024 * 30)
assert len(data) == 0 assert len(data) == 0
@pytest.mark.parametrize("piecefield_obj", [BigfilePiecefield, BigfilePiecefieldPacked]) @pytest.mark.parametrize("piecefield_obj", [BigfilePiecefield, BigfilePiecefieldPacked])
def testPiecefield(self, piecefield_obj, site): def testPiecefield(self, piecefield_obj, site):
testdatas = [ testdatas = [
@ -236,7 +232,7 @@ class TestBigfile:
assert piecefield[0] == int(testdata[0]) assert piecefield[0] == int(testdata[0])
assert piecefield[100] == int(testdata[100]) assert piecefield[100] == int(testdata[100])
assert piecefield[1000] == int(testdata[1000]) assert piecefield[1000] == int(testdata[1000])
assert piecefield[len(testdata)-1] == int(testdata[len(testdata)-1]) assert piecefield[len(testdata) - 1] == int(testdata[len(testdata) - 1])
packed = piecefield.pack() packed = piecefield.pack()
piecefield_new = piecefield_obj() piecefield_new = piecefield_obj()
@ -244,7 +240,6 @@ class TestBigfile:
assert piecefield.tostring() == piecefield_new.tostring() assert piecefield.tostring() == piecefield_new.tostring()
assert piecefield_new.tostring() == testdata assert piecefield_new.tostring() == testdata
def testFileGet(self, file_server, site, site_temp): def testFileGet(self, file_server, site, site_temp):
inner_path = self.createBigfile(site) inner_path = self.createBigfile(site)
@ -277,7 +272,6 @@ class TestBigfile:
# Should not drop error for second block request # Should not drop error for second block request
assert peer2.getFile(site.address, "%s|%s-%s" % (inner_path, 1024 * 1024 * 1, 1024 * 1024 * 2)) assert peer2.getFile(site.address, "%s|%s-%s" % (inner_path, 1024 * 1024 * 1, 1024 * 1024 * 2))
def benchmarkPeerMemory(self, site, file_server): def benchmarkPeerMemory(self, site, file_server):
# Init source server # Init source server
site.connection_server = file_server site.connection_server = file_server
@ -293,7 +287,6 @@ class TestBigfile:
print "%.3fs MEM: + %sKB" % (time.time() - s, (meminfo()[0] - mem_s) / 1024) # 0.082s MEM: + 6800KB print "%.3fs MEM: + %sKB" % (time.time() - s, (meminfo()[0] - mem_s) / 1024) # 0.082s MEM: + 6800KB
print site.peers.values()[0].piecefields print site.peers.values()[0].piecefields
def testUpdatePiecefield(self, file_server, site, site_temp): def testUpdatePiecefield(self, file_server, site, site_temp):
inner_path = self.createBigfile(site) inner_path = self.createBigfile(site)
@ -339,7 +332,6 @@ class TestBigfile:
# It should only request parts from peer1 as the other peers does not have the requested parts in piecefields # It should only request parts from peer1 as the other peers does not have the requested parts in piecefields
assert len([request[1] for request in requests if request[1] != server2_peer1]) == 0 assert len([request[1] for request in requests if request[1] != server2_peer1]) == 0
def testWorkerManagerPiecefieldDownload(self, file_server, site, site_temp): def testWorkerManagerPiecefieldDownload(self, file_server, site, site_temp):
inner_path = self.createBigfile(site) inner_path = self.createBigfile(site)
@ -398,19 +390,18 @@ class TestBigfile:
size_bigfile = site_temp.content_manager.getFileInfo(inner_path)["size"] size_bigfile = site_temp.content_manager.getFileInfo(inner_path)["size"]
with site_temp.storage.openBigfile(inner_path) as f: with site_temp.storage.openBigfile(inner_path) as f:
assert not "\0" in f.read(1024) assert "\0" not in f.read(1024)
assert site_temp.settings["optional_downloaded"] == size_piecemap + size_bigfile assert site_temp.settings["optional_downloaded"] == size_piecemap + size_bigfile
with site_temp.storage.openBigfile(inner_path) as f: with site_temp.storage.openBigfile(inner_path) as f:
# Don't count twice # Don't count twice
assert not "\0" in f.read(1024) assert "\0" not in f.read(1024)
assert site_temp.settings["optional_downloaded"] == size_piecemap + size_bigfile assert site_temp.settings["optional_downloaded"] == size_piecemap + size_bigfile
# Add second block # Add second block
assert not "\0" in f.read(1024 * 1024) assert "\0" not in f.read(1024 * 1024)
assert site_temp.settings["optional_downloaded"] == size_piecemap + size_bigfile assert site_temp.settings["optional_downloaded"] == size_piecemap + size_bigfile
def testPrebuffer(self, file_server, site, site_temp): def testPrebuffer(self, file_server, site, site_temp):
inner_path = self.createBigfile(site) inner_path = self.createBigfile(site)