瀏覽代碼

Merge pull request #2877 from Alexander-N/pylint-rules

Activate more linting rules in .coafile
enkore 7 年之前
父節點
當前提交
daa88e07f2
共有 2 個文件被更改,包括 6 次插入6 次删除
  1. 3 3
      .coafile
  2. 3 3
      src/borg/testsuite/archiver.py

+ 3 - 3
.coafile

@@ -18,13 +18,13 @@ file_naming_convention = snake
 [all.python]
 [all.python]
 files = src/borg/**/*.py
 files = src/borg/**/*.py
 bears = PEP8Bear, PyDocStyleBear, PyLintBear
 bears = PEP8Bear, PyDocStyleBear, PyLintBear
-pep_ignore = E122,E123,E125,E126,E127,E128,E226,E301,E309,E402,F401,F405,F811,W690
+pep_ignore = E123,E125,E126,E127,E128,E226,E301,E309,E402,F401,F405,F811,W690
 pylint_disable = C0103, C0111, C0112, C0123, C0301, C0302, C0325, C0330, C0411, C0412, C0413, C1801,
 pylint_disable = C0103, C0111, C0112, C0123, C0301, C0302, C0325, C0330, C0411, C0412, C0413, C1801,
                  W0102, W0104, W0106, W0108, W0120, W0201, W0212, W0221, W0231, W0401, W0404,
                  W0102, W0104, W0106, W0108, W0120, W0201, W0212, W0221, W0231, W0401, W0404,
                  W0511, W0603, W0611, W0612, W0613, W0614, W0621, W0622, W0702, W0703,
                  W0511, W0603, W0611, W0612, W0613, W0614, W0621, W0622, W0702, W0703,
-                 W1201, W1202, W1401, W1503, W1505,
+                 W1201, W1202, W1401,
                  R0101, R0201, R0204, R0901, R0902, R0903, R0904, R0911, R0912, R0913, R0914, R0915, R0916, R1701, R1704, R1705, R1706,
                  R0101, R0201, R0204, R0901, R0902, R0903, R0904, R0911, R0912, R0913, R0914, R0915, R0916, R1701, R1704, R1705, R1706,
-                 E0102, E0202, E0401, E0601, E0611, E0702, E1101, E1102, E1120, E1129, E1130, E1133
+                 E0102, E0202, E0401, E0601, E0611, E0702, E1101, E1102, E1120, E1129, E1130
 pydocstyle_ignore = D100, D101, D102, D103, D104, D105, D200, D201, D202, D203, D204, D205, D209, D210,
 pydocstyle_ignore = D100, D101, D102, D103, D104, D105, D200, D201, D202, D203, D204, D205, D209, D210,
                     D212, D213, D300, D301, D400, D401, D402, D403, D404
                     D212, D213, D300, D301, D400, D401, D402, D403, D404
 
 

+ 3 - 3
src/borg/testsuite/archiver.py

@@ -2800,7 +2800,7 @@ class ArchiverCheckTestCase(ArchiverTestCaseBase):
                     repository.delete(killed_chunk.id)
                     repository.delete(killed_chunk.id)
                     break
                     break
             else:
             else:
-                self.assert_true(False)  # should not happen
+                self.fail('should not happen')
             repository.commit()
             repository.commit()
         self.cmd('check', self.repository_location, exit_code=1)
         self.cmd('check', self.repository_location, exit_code=1)
         output = self.cmd('check', '--repair', self.repository_location, exit_code=0)
         output = self.cmd('check', '--repair', self.repository_location, exit_code=0)
@@ -2818,7 +2818,7 @@ class ArchiverCheckTestCase(ArchiverTestCaseBase):
                         self.assert_not_in(killed_chunk, item.chunks)
                         self.assert_not_in(killed_chunk, item.chunks)
                         break
                         break
                 else:
                 else:
-                    self.assert_true(False)  # should not happen
+                    self.fail('should not happen')
         # do a fresh backup (that will include the killed chunk)
         # do a fresh backup (that will include the killed chunk)
         with patch.object(ChunkBuffer, 'BUFFER_SIZE', 10):
         with patch.object(ChunkBuffer, 'BUFFER_SIZE', 10):
             self.create_src_archive('archive3')
             self.create_src_archive('archive3')
@@ -2835,7 +2835,7 @@ class ArchiverCheckTestCase(ArchiverTestCaseBase):
                         self.assert_equal(valid_chunks, item.chunks)
                         self.assert_equal(valid_chunks, item.chunks)
                         break
                         break
                 else:
                 else:
-                    self.assert_true(False)  # should not happen
+                    self.fail('should not happen')
         # list is also all-healthy again
         # list is also all-healthy again
         output = self.cmd('list', '--format={health}#{path}{LF}', self.repository_location + '::archive1', exit_code=0)
         output = self.cmd('list', '--format={health}#{path}{LF}', self.repository_location + '::archive1', exit_code=0)
         self.assert_not_in('broken#', output)
         self.assert_not_in('broken#', output)