mirror/borg
1
0
Fork 0
mirror of https://github.com/borgbackup/borg.git synced 2024-12-25 01:06:50 +00:00
Code Issues Releases Wiki Activity

Merge pull request #2537 from enkore/f/osxfail

Browse source 
testsuite: call setup_logging after destroying logging config
This commit is contained in:
enkore 2017-05-20 23:23:26 +02:00 committed by GitHub
commit 1cd90b2c86
1 changed files with 2 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/borg/testsuite/archiver.py
View file

@ -44,6 +44,7 @@
from ..helpers import MAX_S from ..helpers import MAX_S
from ..patterns import IECommand, PatternMatcher, parse_pattern from ..patterns import IECommand, PatternMatcher, parse_pattern
from ..item import Item from ..item import Item
from ..logger import setup_logging
from ..remote import RemoteRepository, PathNotAllowed from ..remote import RemoteRepository, PathNotAllowed
from ..repository import Repository from ..repository import Repository
from . import has_lchflags, has_llfuse from . import has_lchflags, has_llfuse
@ -265,6 +266,7 @@ def tearDown(self):
shutil.rmtree(self.tmpdir, ignore_errors=True) shutil.rmtree(self.tmpdir, ignore_errors=True)
# destroy logging configuration # destroy logging configuration
logging.Logger.manager.loggerDict.clear() logging.Logger.manager.loggerDict.clear()
setup_logging()
def cmd(self, *args, **kw): def cmd(self, *args, **kw):
exit_code = kw.pop('exit_code', 0) exit_code = kw.pop('exit_code', 0)