mirror
/
borg
mirror of https://github.com/borgbackup/borg.git
1
0
Fork 0
Code Issues Releases Wiki Activity

fix cyclic import issue, fix tests 

needed to increase ChunkBuffer size due to increased items stream chunk size
to get the test working.
This commit is contained in:
Thomas Waldmann 2016-08-14 15:07:18 +02:00
parent 8be6761c26
commit 42b6a838da
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/borg/archive.py
View File

@ -169,7 +169,7 @@ class DownloadPipeline:
class ChunkBuffer: class ChunkBuffer:
BUFFER_SIZE = 1 * 1024 * 1024 BUFFER_SIZE = 8 * 1024 * 1024
def __init__(self, key, chunker_params=ITEMS_CHUNKER_PARAMS): def __init__(self, key, chunker_params=ITEMS_CHUNKER_PARAMS):
self.buffer = BytesIO() self.buffer = BytesIO()

2
src/borg/helpers.py
View File

@ -39,7 +39,6 @@ from . import crypto
from . import hashindex from . import hashindex
from . import shellpattern from . import shellpattern
from .constants import * # NOQA from .constants import * # NOQA
from .compress import get_compressor
# meta dict, data bytes # meta dict, data bytes
_Chunk = namedtuple('_Chunk', 'meta data') _Chunk = namedtuple('_Chunk', 'meta data')
@ -1584,6 +1583,7 @@ class CompressionDecider2:
return compr_spec, chunk return compr_spec, chunk
def heuristic_lz4(self, compr_args, chunk): def heuristic_lz4(self, compr_args, chunk):
from .compress import get_compressor
meta, data = chunk meta, data = chunk
lz4 = get_compressor('lz4') lz4 = get_compressor('lz4')
cdata = lz4.compress(data) cdata = lz4.compress(data)

2
src/borg/testsuite/archive.py
View File

@ -109,7 +109,7 @@ class ChunkBufferTestCase(BaseTestCase):
self.assert_equal(data, [Item(internal_dict=d) for d in unpacker]) self.assert_equal(data, [Item(internal_dict=d) for d in unpacker])
def test_partial(self): def test_partial(self):
big = "0123456789" * 10000 big = "0123456789abcdefghijklmnopqrstuvwxyz" * 25000
data = [Item(path='full', source=big), Item(path='partial', source=big)] data = [Item(path='full', source=big), Item(path='partial', source=big)]
cache = MockCache() cache = MockCache()
key = PlaintextKey(None) key = PlaintextKey(None)