From e7523b7d4652ebf088ea12a0c3b124c8711bc4cc Mon Sep 17 00:00:00 2001 From: Marian Beermann Date: Sun, 22 May 2016 11:29:44 +0200 Subject: [PATCH] Fix fuse tests when flags are available e.g. fuse installed, TMPDIR != tmpfs --- borg/testsuite/archiver.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/borg/testsuite/archiver.py b/borg/testsuite/archiver.py index 173a01e18..e4c830dac 100644 --- a/borg/testsuite/archiver.py +++ b/borg/testsuite/archiver.py @@ -1255,6 +1255,9 @@ class ArchiverTestCase(ArchiverTestCaseBase): try: self.cmd('mount', self.repository_location, mountpoint, fork=True) self.wait_for_mount(mountpoint) + if has_lchflags: + # remove the file we did not backup, so input and output become equal + os.remove(os.path.join('input', 'flagfile')) self.assert_dirs_equal(self.input_path, os.path.join(mountpoint, 'archive', 'input')) self.assert_dirs_equal(self.input_path, os.path.join(mountpoint, 'archive2', 'input')) finally: @@ -1276,6 +1279,9 @@ class ArchiverTestCase(ArchiverTestCaseBase): try: self.cmd('mount', self.repository_location + '::archive', mountpoint, fork=True) self.wait_for_mount(mountpoint) + if has_lchflags: + # remove the file we did not backup, so input and output become equal + os.remove(os.path.join('input', 'flagfile')) self.assert_dirs_equal(self.input_path, os.path.join(mountpoint, 'input')) finally: if sys.platform.startswith('linux'):