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

--progress option was backwards 

adds unit tests and ensures we detect --progress correctly in all cases
This commit is contained in:
Antoine Beaupré 2015-11-20 14:56:18 -05:00
parent a7eb83efa5
commit a40729f4f3
2 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
borg/archiver.py
View File

@ -775,7 +775,7 @@ class Archiver:
""" """
def __call__(self, parser, ns, values, option): def __call__(self, parser, ns, values, option):
"""set the given flag to true unless ``--no`` is passed""" """set the given flag to true unless ``--no`` is passed"""
setattr(ns, self.dest, option.startswith('--no-')) setattr(ns, self.dest, not option.startswith('--no-'))
subparser = subparsers.add_parser('create', parents=[common_parser], subparser = subparsers.add_parser('create', parents=[common_parser],
description=self.do_create.__doc__, description=self.do_create.__doc__,

22
borg/testsuite/archiver.py
View File

@ -669,6 +669,28 @@ class ArchiverTestCase(ArchiverTestCaseBase):
manifest, key = Manifest.load(repository) manifest, key = Manifest.load(repository)
self.assert_equal(len(manifest.archives), 0) self.assert_equal(len(manifest.archives), 0)
def test_progress(self):
self.create_regular_file('file1', size=1024 * 80)
self.cmd('init', self.repository_location)
# without a terminal, no progress expected
output = self.cmd('create', self.repository_location + '::test1', 'input', fork=False)
self.assert_not_in("\r", output)
# with a terminal, progress expected
output = self.cmd('create', self.repository_location + '::test2', 'input', fork=True)
self.assert_in("\r", output)
# without a terminal, progress forced on
output = self.cmd('create', '--progress', self.repository_location + '::test3', 'input', fork=False)
self.assert_in("\r", output)
# with a terminal, progress forced on
output = self.cmd('create', '--progress', self.repository_location + '::test4', 'input', fork=True)
self.assert_in("\r", output)
# without a termainl, progress forced off
output = self.cmd('create', '--no-progress', self.repository_location + '::test5', 'input', fork=False)
self.assert_not_in("\r", output)
# with a termainl, progress forced off
output = self.cmd('create', '--no-progress', self.repository_location + '::test6', 'input', fork=True)
self.assert_not_in("\r", output)
def test_cmdline_compatibility(self): def test_cmdline_compatibility(self):
self.create_regular_file('file1', size=1024 * 80) self.create_regular_file('file1', size=1024 * 80)
self.cmd('init', self.repository_location) self.cmd('init', self.repository_location)