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

Merge pull request #3607 from ThomasWaldmann/fix-zstd-testing 

fix erroneously skipped zstd compressor tests, fixes #3606
This commit is contained in:
TW 2018-02-10 21:49:39 +01:00 committed by GitHub
parent 24b0bcb461 246a8d57ee
commit 1922ae3242
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 @@ try:
except ImportError:
lzma = None
try:
import zstd
except ImportError:
zstd = None
import pytest
from ..compress import get_compressor, Compressor, CompressionSpec, CNONE, ZLIB, LZ4, LZMA, ZSTD, Auto
@ -75,8 +70,6 @@ def test_lzma():
def test_zstd():
if zstd is None:
pytest.skip("No zstd support found.")
c = get_compressor(name='zstd')
cdata = c.compress(data)
assert len(cdata) < len(data)
@ -109,6 +102,9 @@ def test_compressor():
params_list = [
dict(name='none'),
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=6),
dict(name='zlib', level=9),
@ -119,12 +115,6 @@ def test_compressor():
dict(name='lzma', level=6),
# 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:
c = Compressor(**params)
assert data == c.decompress(c.compress(data))