mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2025-02-24 15:12:00 +00:00
Code Issues Releases Wiki Activity

Merge pull request #3655 from miek/backport-3607

Browse source 
Backport #3607 to 1.1-maint
This commit is contained in:
TW 2018-03-02 17:53:03 +01:00 committed by GitHub
commit 2e40f70911
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/borg/testsuite/compress.py
View file

@ -5,11 +5,6 @@
except ImportError: except ImportError:
lzma = None lzma = None
try:
import zstd
except ImportError:
zstd = None
import pytest import pytest
from ..compress import get_compressor, Compressor, CompressionSpec, CNONE, ZLIB, LZ4, LZMA, ZSTD, Auto from ..compress import get_compressor, Compressor, CompressionSpec, CNONE, ZLIB, LZ4, LZMA, ZSTD, Auto
@ -75,8 +70,6 @@ def test_lzma():
def test_zstd(): def test_zstd():
if zstd is None:
pytest.skip("No zstd support found.")
c = get_compressor(name='zstd') c = get_compressor(name='zstd')
cdata = c.compress(data) cdata = c.compress(data)
assert len(cdata) < len(data) assert len(cdata) < len(data)
@ -109,6 +102,9 @@ def test_compressor():
params_list = [ params_list = [
dict(name='none'), dict(name='none'),
dict(name='lz4'), dict(name='lz4'),
dict(name='zstd', level=1),
dict(name='zstd', level=3),
# avoiding high zstd levels, memory needs unclear
dict(name='zlib', level=0), dict(name='zlib', level=0),
dict(name='zlib', level=6), dict(name='zlib', level=6),
dict(name='zlib', level=9), dict(name='zlib', level=9),
@ -119,12 +115,6 @@ def test_compressor():
dict(name='lzma', level=6), dict(name='lzma', level=6),
# we do not test lzma on level 9 because of the huge memory needs # we do not test lzma on level 9 because of the huge memory needs
] ]
if zstd:
params_list += [
dict(name='zstd', level=1),
dict(name='zstd', level=3),
# also avoiding high zstd levels, memory needs unclear
]
for params in params_list: for params in params_list:
c = Compressor(**params) c = Compressor(**params)
assert data == c.decompress(c.compress(data)) assert data == c.decompress(c.compress(data))