Skip to content

Commit ca38a5d

Browse files
authored
Merge pull request #17 from desultory/dev
fix compression tests
2 parents bdde379 + 2074025 commit ca38a5d

File tree

1 file changed

+9
-5
lines changed

1 file changed

+9
-5
lines changed

tests/test_compression.py

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
from uuid import uuid4
44

55
from pycpio import PyCPIO
6+
from pycpio.errors import UnavailableCompression
67
from zenlib.logging import loggify
78

89

@@ -55,23 +56,26 @@ def make_test_files(self, count, subdir=None, data=None):
5556

5657
def test_write_no_compress(self):
5758
self.make_test_files(100)
58-
self.cpio.append_cpio(self.workdir.name)
59+
self.cpio.append_recursive(self.workdir.name)
5960
out_file = NamedTemporaryFile() # Out file for the cpio
6061
self.cpio.write_cpio_file(out_file.file.name)
6162
out_file.file.flush()
6263

6364
def test_write_xz_compress(self):
6465
self.make_test_files(100)
65-
self.cpio.append_cpio(self.workdir.name)
66+
self.cpio.append_recursive(self.workdir.name)
6667
out_file = NamedTemporaryFile()
67-
self.cpio.write_cpio_file(out_file.file.name, compress="xz")
68+
self.cpio.write_cpio_file(out_file.file.name, compression="xz")
6869
out_file.file.flush()
6970

7071
def test_write_zstd_compress(self):
7172
self.make_test_files(100)
72-
self.cpio.append_cpio(self.workdir.name)
73+
self.cpio.append_recursive(self.workdir.name)
7374
out_file = NamedTemporaryFile()
74-
self.cpio.write_cpio_file(out_file.file.name, compress="zstd")
75+
try:
76+
self.cpio.write_cpio_file(out_file.file.name, compression="zstd")
77+
except UnavailableCompression as e:
78+
self.skipTest(f"Zstandard compression is not available in this environment: {e}")
7579
out_file.file.flush()
7680

7781

0 commit comments

Comments
 (0)