浏览代码

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.
Antoine Beaupré 9 年之前
父节点
当前提交
efa88ef6c6
共有 2 个文件被更改,包括 3 次插入3 次删除
  1. 2 2
      borg/archive.py
  2. 1 1
      borg/archiver.py

+ 2 - 2
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)

+ 1 - 1
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: