Forráskód Böngészése

Merge pull request #2537 from enkore/f/osxfail

testsuite: call setup_logging after destroying logging config
enkore 8 éve
szülő
commit
1cd90b2c86
1 módosított fájl, 2 hozzáadás és 0 törlés
  1. 2 0
      src/borg/testsuite/archiver.py

+ 2 - 0
src/borg/testsuite/archiver.py

@@ -44,6 +44,7 @@ from ..helpers import bin_to_hex
 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 @@ class ArchiverTestCaseBase(BaseTestCase):
         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)