From efa88ef6c6f6fb971fdb5c1abd4213981f5ab4c6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Antoine=20Beaupr=C3=A9?= Date: Fri, 9 Oct 2015 12:11:42 -0400 Subject: [PATCH] fix tests: they expect check to spew output our default verbosity shows only warnings, we'd have to tweak tests to be verbose for this to work This reverts commit 27be46a5badec15ca08afd8f158904e9dc3f8544. --- borg/archive.py | 4 ++-- borg/archiver.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/borg/archive.py b/borg/archive.py index 5e2a35b71..31514dec2 100644 --- a/borg/archive.py +++ b/borg/archive.py @@ -677,7 +677,7 @@ class ArchiveChecker: def report_progress(self, msg, error=False): if error: self.error_found = True - logger.log(logging.ERROR if error else logging.INFO, msg) + logger.log(logging.ERROR if error else logging.WARNING, msg) def identify_key(self, repository): cdata = repository.get(next(self.chunks.iteritems())[0]) @@ -804,7 +804,7 @@ class ArchiveChecker: num_archives = 1 end = 1 for i, (name, info) in enumerate(archive_items[:end]): - self.report_progress('Analyzing archive {} ({}/{})'.format(name, num_archives - i, num_archives)) + logger.info('Analyzing archive {} ({}/{})'.format(name, num_archives - i, num_archives)) archive_id = info[b'id'] if archive_id not in self.chunks: self.report_progress('Archive metadata block is missing', error=True) diff --git a/borg/archiver.py b/borg/archiver.py index c67f9bf14..5390748cb 100644 --- a/borg/archiver.py +++ b/borg/archiver.py @@ -84,7 +84,7 @@ Type "Yes I am sure" if you understand this and want to continue.\n""") if input('Do you want to continue? ') == 'Yes I am sure': break if not args.archives_only: - logger.info('Starting repository check...') + logger.warning('Starting repository check...') if repository.check(repair=args.repair): logger.info('Repository check complete, no problems found.') else: