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

Merge pull request #845 from enkore/issue/844 

Test suite: Reset exit code of persistent archiver
This commit is contained in:
TW 2016-04-06 15:06:52 +02:00
parent 515b7454a3 b59f92a533
commit df7aa6476d
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
borg/testsuite/archiver.py
View File

@ -59,6 +59,7 @@ def exec_cmd(*args, archiver=None, fork=False, exe=None, **kw):
sys.stdout = sys.stderr = output = StringIO() sys.stdout = sys.stderr = output = StringIO()
if archiver is None: if archiver is None:
archiver = Archiver() archiver = Archiver()
archiver.exit_code = EXIT_SUCCESS
args = archiver.parse_args(list(args)) args = archiver.parse_args(list(args))
ret = archiver.run(args) ret = archiver.run(args)
return ret, output.getvalue() return ret, output.getvalue()
@ -733,7 +734,6 @@ class ArchiverTestCase(ArchiverTestCaseBase):
self.cmd('create', self.repository_location + '::test.2', 'input') self.cmd('create', self.repository_location + '::test.2', 'input')
os.environ['BORG_DELETE_I_KNOW_WHAT_I_AM_DOING'] = 'no' os.environ['BORG_DELETE_I_KNOW_WHAT_I_AM_DOING'] = 'no'
self.cmd('delete', self.repository_location, exit_code=2) self.cmd('delete', self.repository_location, exit_code=2)
self.archiver.exit_code = 0
assert os.path.exists(self.repository_path) assert os.path.exists(self.repository_path)
os.environ['BORG_DELETE_I_KNOW_WHAT_I_AM_DOING'] = 'YES' os.environ['BORG_DELETE_I_KNOW_WHAT_I_AM_DOING'] = 'YES'
self.cmd('delete', self.repository_location) self.cmd('delete', self.repository_location)