Merge lp:~gz/brz/flake8_source_test into lp:brz

[Martin Packman]

Make flake8 source test behave

Using the new 'legacy' api where possible, skipping only on compat issues.

Next text_log_file() test method to get context for writing text in.

Ignore some more error types, fix a few lint complaints.

[Jelmer Vernooij (jelmer)]

review: Approve

=== modified file 'breezy/bzr/__init__.py'
--- breezy/bzr/__init__.py	2020-07-28 02:11:05 +0000
+++ breezy/bzr/__init__.py	2021-08-21 13:33:23 +0000
@@ -51,7 +51,7 @@
             raise errors.NotBranchError(path=transport.base)
         except errors.BadHttpRequest as e:
             if e.reason == 'no such method: .bzr':
-                # hgweb 
+                # hgweb
                 raise errors.NotBranchError(path=transport.base)
             raise
 
 
=== modified file 'breezy/git/tests/test_tree.py'
--- breezy/git/tests/test_tree.py	2021-08-20 15:04:24 +0000
+++ breezy/git/tests/test_tree.py	2021-08-21 13:33:23 +0000
@@ -34,6 +34,9 @@
 from breezy.git.mapping import default_mapping
 
 
+REG_MODE = stat.S_IFREG | 0o644
+
+
 class ChangesFromGitChangesTests(TestCase):
 
     def setUp(self):
@@ -62,7 +65,7 @@
                 (False, False), False)
             ], self.transform([
             ('modify',
-            (b'a', stat.S_IFREG|0o644, a), (b'a', stat.S_IFREG|0o644, b))]))
+            (b'a', REG_MODE, a), (b'a', REG_MODE, b))]))
 
     def test_kind_changed(self):
         a = Blob.from_string(b'a')
@@ -74,7 +77,7 @@
                 (False, False), False)
             ], self.transform([
             ('modify',
-            (b'a', stat.S_IFREG|0o644, a), (b'a', stat.S_IFLNK, b))]))
+            (b'a', REG_MODE, a), (b'a', stat.S_IFLNK, b))]))
 
     def test_rename_no_changes(self):
         a = Blob.from_string(b'a')
@@ -85,7 +88,7 @@
                 ('file', 'file'), (False, False), False)
             ], self.transform([
             ('rename',
-            (b'old', stat.S_IFREG|0o644, a), (b'a', stat.S_IFREG|0o644, a))]))
+            (b'old', REG_MODE, a), (b'a', REG_MODE, a))]))
 
     def test_rename_and_modify(self):
         a = Blob.from_string(b'a')
@@ -97,7 +100,7 @@
                 ('file', 'file'), (False, False), False)
             ], self.transform([
             ('rename',
-            (b'a', stat.S_IFREG|0o644, a), (b'b', stat.S_IFREG|0o644, b))]))
+            (b'a', REG_MODE, a), (b'b', REG_MODE, b))]))
 
     def test_copy_no_changes(self):
         a = Blob.from_string(b'a')
@@ -108,7 +111,7 @@
                 ('file', 'file'), (False, False), True)
             ], self.transform([
             ('copy',
-            (b'old', stat.S_IFREG|0o644, a), (b'a', stat.S_IFREG|0o644, a))]))
+            (b'old', REG_MODE, a), (b'a', REG_MODE, a))]))
 
     def test_copy_and_modify(self):
         a = Blob.from_string(b'a')
@@ -120,7 +123,7 @@
                 ('file', 'file'), (False, False), True)
             ], self.transform([
             ('copy',
-            (b'a', stat.S_IFREG|0o644, a), (b'b', stat.S_IFREG|0o644, b))]))
+            (b'a', REG_MODE, a), (b'b', REG_MODE, b))]))
 
     def test_add(self):
         b = Blob.from_string(b'b')
@@ -130,7 +133,7 @@
                 (None, 'a'), (None, 'file'), (None, False), False)
             ], self.transform([
             ('add',
-            (None, None, None), (b'a', stat.S_IFREG|0o644, b))]))
+            (None, None, None), (b'a', REG_MODE, b))]))
 
     def test_delete(self):
         b = Blob.from_string(b'b')
@@ -140,7 +143,7 @@
                 ('a', None), ('file', None), (False, None), False)
             ], self.transform([
             ('remove',
-            (b'a', stat.S_IFREG|0o644, b), (None, None, None))]))
+            (b'a', REG_MODE, b), (None, None, None))]))
 
     def test_unchanged(self):
         b = Blob.from_string(b'b')
@@ -151,11 +154,11 @@
                 (False, False), False)
             ], self.transform([
             ('unchanged',
-            (b'a', stat.S_IFREG|0o644, b), (b'a', stat.S_IFREG|0o644, b))],
+            (b'a', REG_MODE, b), (b'a', REG_MODE, b))],
             include_unchanged=True))
         self.assertEqual([], self.transform([
             ('unchanged',
-            (b'a', stat.S_IFREG|0o644, b), (b'a', stat.S_IFREG|0o644, b))],
+            (b'a', REG_MODE, b), (b'a', REG_MODE, b))],
             include_unchanged=False))
 
     def test_unversioned(self):
@@ -167,7 +170,7 @@
                 (None, False), False)
             ], self.transform([
             ('add',
-            (None, None, None), (b'a', stat.S_IFREG|0o644, b))],
+            (None, None, None), (b'a', REG_MODE, b))],
             target_extras=set([b'a'])))
         self.assertEqual([
             TreeChange(
@@ -176,7 +179,7 @@
                 (False, False), False)
             ], self.transform([
             ('add',
-            (b'a', stat.S_IFREG|0o644, b), (b'a', stat.S_IFREG|0o644, b))],
+            (b'a', REG_MODE, b), (b'a', REG_MODE, b))],
             source_extras=set([b'a']),
             target_extras=set([b'a'])))
 
@@ -206,7 +209,7 @@
         b = Blob.from_string(b'b')
         delta = self.transform([
             ('modify',
-            (b'a', stat.S_IFREG|0o644, a), (b'a', stat.S_IFREG|0o644, b))])
+            (b'a', REG_MODE, a), (b'a', REG_MODE, b))])
         expected_delta = TreeDelta()
         expected_delta.modified.append(TreeChange(
             b'git:a', ('a', 'a'), True, (True, True),
@@ -218,7 +221,7 @@
         a = Blob.from_string(b'a')
         delta = self.transform([
             ('rename',
-            (b'old', stat.S_IFREG|0o644, a), (b'a', stat.S_IFREG|0o644, a))])
+            (b'old', REG_MODE, a), (b'a', REG_MODE, a))])
         expected_delta = TreeDelta()
         expected_delta.renamed.append(
             TreeChange(
@@ -232,7 +235,7 @@
         b = Blob.from_string(b'b')
         delta = self.transform([
             ('rename',
-            (b'a', stat.S_IFREG|0o644, a), (b'b', stat.S_IFREG|0o644, b))])
+            (b'a', REG_MODE, a), (b'b', REG_MODE, b))])
         expected_delta = TreeDelta()
         expected_delta.renamed.append(
             TreeChange(
@@ -245,7 +248,7 @@
         a = Blob.from_string(b'a')
         delta = self.transform([
             ('copy',
-            (b'old', stat.S_IFREG|0o644, a), (b'a', stat.S_IFREG|0o644, a))])
+            (b'old', REG_MODE, a), (b'a', REG_MODE, a))])
         expected_delta = TreeDelta()
         expected_delta.copied.append(TreeChange(
                 b'git:a', ('old', 'a'), False, (True, True),
@@ -258,7 +261,7 @@
         b = Blob.from_string(b'b')
         delta = self.transform([
             ('copy',
-            (b'a', stat.S_IFREG|0o644, a), (b'b', stat.S_IFREG|0o644, b))])
+            (b'a', REG_MODE, a), (b'b', REG_MODE, b))])
         expected_delta = TreeDelta()
         expected_delta.copied.append(TreeChange(
                 b'git:b', ('a', 'b'), True, (True, True),
@@ -270,7 +273,7 @@
         b = Blob.from_string(b'b')
         delta = self.transform([
             ('add',
-            (None, None, None), (b'a', stat.S_IFREG|0o644, b))])
+            (None, None, None), (b'a', REG_MODE, b))])
         expected_delta = TreeDelta()
         expected_delta.added.append(TreeChange(
                 b'git:a', (None, 'a'), True, (False, True), (None, b'TREE_ROOT'),
@@ -281,7 +284,7 @@
         b = Blob.from_string(b'b')
         delta = self.transform([
             ('remove',
-            (b'a', stat.S_IFREG | 0o644, b),
+            (b'a', REG_MODE, b),
             (None, None, None))])
         expected_delta = TreeDelta()
         expected_delta.removed.append(TreeChange(
@@ -293,7 +296,7 @@
         b = Blob.from_string(b'b')
         delta = self.transform([
             ('unchanged',
-            (b'a', stat.S_IFREG|0o644, b), (b'a', stat.S_IFREG|0o644, b))])
+            (b'a', REG_MODE, b), (b'a', REG_MODE, b))])
         expected_delta = TreeDelta()
         expected_delta.unchanged.append(TreeChange(
                 b'git:a', ('a', 'a'), False, (True, True),
@@ -304,7 +307,7 @@
         b = Blob.from_string(b'b')
         delta = self.transform([
             ('add',
-            (None, None, None), (b'a', stat.S_IFREG|0o644, b))],
+            (None, None, None), (b'a', REG_MODE, b))],
             target_extras=set([b'a']))
         expected_delta = TreeDelta()
         expected_delta.unversioned.append(
@@ -315,7 +318,7 @@
         self.assertEqual(delta, expected_delta)
         delta = self.transform([
             ('add',
-            (b'a', stat.S_IFREG|0o644, b), (b'a', stat.S_IFREG|0o644, b))],
+            (b'a', REG_MODE, b), (b'a', REG_MODE, b))],
             source_extras=set([b'a']),
             target_extras=set([b'a']))
         expected_delta = TreeDelta()
@@ -330,7 +333,7 @@
         b = Blob.from_string(b'target')
         delta = self.transform([
             ('modify',
-             (b'a', stat.S_IFREG|0o644, a), (b'a', stat.S_IFLNK, b))])
+             (b'a', REG_MODE, a), (b'a', stat.S_IFLNK, b))])
         expected_delta = TreeDelta()
         expected_delta.kind_changed.append(TreeChange(
             b'git:a', ('a', 'a'), True, (True, True),
 
=== modified file 'breezy/tests/__init__.py'
--- breezy/tests/__init__.py	2021-08-20 15:32:58 +0000
+++ breezy/tests/__init__.py	2021-08-21 13:33:23 +0000
@@ -23,6 +23,7 @@
 
 import atexit
 import codecs
+import contextlib
 import copy
 import difflib
 import doctest
@@ -1692,6 +1693,12 @@
         self._log_memento = trace.push_log_file(self._log_file)
         self.addCleanup(self._finishLogFile)
 
+    @contextlib.contextmanager
+    def text_log_file(self, **kwargs):
+        stream = TextIOWrapper(self._log_file, encoding='utf-8', **kwargs)
+        yield stream
+        stream.detach()
+
     def _finishLogFile(self):
         """Flush and dereference the in-memory log for this testcase"""
         if trace._trace_file:
 
=== modified file 'breezy/tests/blackbox/test_big_file.py'
--- breezy/tests/blackbox/test_big_file.py	2020-05-30 03:06:21 +0000
+++ breezy/tests/blackbox/test_big_file.py	2021-08-21 13:33:23 +0000
@@ -41,9 +41,6 @@
 RESOURCE = resource.RLIMIT_AS
 LIMIT = 1024 * 1024 * 100
 
-if sys.version_info[0] == 2:
-    range = xrange
-
 
 def make_big_file(path):
     blob_1mb = BIG_FILE_CHUNK_SIZE * b'\x0c'
 
=== modified file 'breezy/tests/test_source.py'
--- breezy/tests/test_source.py	2021-08-20 14:07:13 +0000
+++ breezy/tests/test_source.py	2021-08-21 13:33:23 +0000
@@ -319,49 +319,27 @@
             self.fail('\n\n'.join(problems))
 
     def test_flake8(self):
-        try:
-            self.requireFeature(features.flake8)
-        except (SyntaxError, NameError):
-            # importlib_metadata uses ModuleNotFoundError, which is
-            # python 3.6 only
-            if sys.version_info[:2] <= (3, 5):
-                self.skipTest('python version too old')
-            raise
-        # Older versions of flake8 don't support the 'paths'
-        # variable
-        new_path = list(sys.path)
-        new_path.insert(
-            0, os.path.join(os.path.dirname(__file__), '..', '..', 'tools'))
-        self.overrideAttr(sys, 'path', new_path)
-        import argparse
-        from flake8.main.application import Application
-        from flake8.formatting.base import BaseFormatter
-        app = Application()
-        app.config = u'setup.cfg'
-        app.jobs = 1
-
-        class Formatter(BaseFormatter):
-
-            def __init__(self):
-                self.errors = []
-
-            def start(self):
-                pass
-
-            def stop(self):
-                app.file_checker_manager.report()
-
-            def handle(self, error):
-                self.errors.append(error)
-
-        try:
-            app.initialize([])
-        except argparse.ArgumentError as e:
+        self.requireFeature(features.flake8)
+        try:
+            from flake8.api.legacy import get_style_guide
+            from flake8.main.options import JobsArgument
+            from flake8.formatting.default import Default
+
+            style = get_style_guide(jobs=JobsArgument("1"))
+        except Exception as e:
             self.skipTest('broken flake8: %r' % e)
-        app.formatter = Formatter()
-        app.run_checks()
-        app.report()
-        self.assertEqual(app.formatter.errors, [])
+
+        with self.text_log_file() as log_file:
+
+            class Formatter(Default):
+
+                def after_init(self):
+                    self.output_fd = log_file
+
+            style.init_report(Formatter)
+            report = style.check_files()
+
+        self.assertEqual(report.total_errors, 0)
 
     def test_no_asserts(self):
         """bzr shouldn't use the 'assert' statement."""
 
=== modified file 'setup.cfg'
--- setup.cfg	2018-11-20 23:50:57 +0000
+++ setup.cfg	2021-08-21 13:33:23 +0000
@@ -2,10 +2,11 @@
 # Ignore E402 ("module level import not at top of file"),
 # because even with the lazy import plugin it still triggers
 # for lazy_import statements before other imports.
+exclude = .git,__pycache__,build,dist,target
 ignore =
    D
    I
-   E123
+   E12
    E261
    E265
    E266
@@ -31,10 +32,11 @@
    F812
    F821
    F841
+   W391
    W503
    W504
    W605
-filename = *.py,brz
+filename = *.py
 
 [flake8:local-plugins]
 extension =
 
=== removed directory 'src'