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

Merge pull request #1265 from ThomasWaldmann/fix-sparse-test-prep 

sparse test: fix sparseness assertion in test prep, fixes #1264
This commit is contained in:
TW 2016-07-05 17:33:21 +02:00 committed by GitHub
parent 6977fcf9e2 498d4b141e
commit 8a040f748b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
borg/testsuite/archiver.py
View File

@ -398,7 +398,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
st = os.stat(filename) st = os.stat(filename)
self.assert_equal(st.st_size, total_len) self.assert_equal(st.st_size, total_len)
if sparse_support and hasattr(st, 'st_blocks'): if sparse_support and hasattr(st, 'st_blocks'):
self.assert_true(st.st_blocks * 512 < total_len / 9) # is input sparse? self.assert_true(st.st_blocks * 512 < total_len) # is input sparse?
self.cmd('init', self.repository_location) self.cmd('init', self.repository_location)
self.cmd('create', self.repository_location + '::test', 'input') self.cmd('create', self.repository_location + '::test', 'input')
with changedir('output'): with changedir('output'):
@ -415,7 +415,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
if sparse_support: if sparse_support:
if hasattr(st, 'st_blocks'): if hasattr(st, 'st_blocks'):
# do only check if it is less, do NOT check if it is much less # do only check if it is less, do NOT check if it is much less
# as that causes troubles on xfs and zfs: # as that causes troubles on xfs, zfs, ntfs:
self.assert_true(st.st_blocks * 512 < total_len) self.assert_true(st.st_blocks * 512 < total_len)
if hasattr(os, 'SEEK_HOLE') and hasattr(os, 'SEEK_DATA'): if hasattr(os, 'SEEK_HOLE') and hasattr(os, 'SEEK_DATA'):
with open(filename, 'rb') as fd: with open(filename, 'rb') as fd: