upstream/borgbackup
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2026-06-09 00:32:37 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 5

fix tests after merge - we must not care for file order

Browse source
This commit is contained in:
Thomas Waldmann 2015-08-15 21:50:13 +02:00
parent 91d2cfa671
commit 03ee28b544
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
borg/testsuite/archiver.py
View file

@ -202,7 +202,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
with changedir('output'):
self.cmd('extract', self.repository_location + '::test')
self.assert_equal(len(self.cmd('list', self.repository_location).splitlines()), 2)
expected = [
expected = set([
'input',
'input/bdev',
'input/cdev',
@ -214,7 +214,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
'input/flagfile',
'input/hardlink',
'input/link1',
]
])
if not have_root:
# we could not create these device files without (fake)root
expected.remove('input/bdev')
@ -223,7 +223,7 @@ class ArchiverTestCase(ArchiverTestCaseBase):
# remove the file we did not backup, so input and output become equal
expected.remove('input/flagfile') # this file is UF_NODUMP
os.remove(os.path.join('input', 'flagfile'))
self.assert_equal(self.cmd('list', '--short', self.repository_location + '::test').splitlines(), expected)
self.assert_equal(set(self.cmd('list', '--short', self.repository_location + '::test').splitlines()), expected)
self.assert_dirs_equal('input', 'output/input')
info_output = self.cmd('info', self.repository_location + '::test')
item_count = 3 if has_lchflags else 4 # one file is UF_NODUMP