From 9c672398474bc312a2c5aa84ccab617a84c950a7 Mon Sep 17 00:00:00 2001
From: Florian Bruhin <me@the-compiler.org>
Date: Sat, 8 Sep 2018 13:59:11 +0200
Subject: [PATCH] Fix lint

---
 scripts/dev/run_pylint_on_tests.py |  9 ++++++---
 tests/helpers/fixtures.py          |  2 --
 tests/unit/browser/test_caret.py   | 12 ++++--------
 3 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/scripts/dev/run_pylint_on_tests.py b/scripts/dev/run_pylint_on_tests.py
index 7adf45f76..f7855dfb7 100644
--- a/scripts/dev/run_pylint_on_tests.py
+++ b/scripts/dev/run_pylint_on_tests.py
@@ -65,9 +65,12 @@ def main():
         toxinidir,
     ]
 
-    args = (['--disable={}'.format(','.join(disabled)),
-             '--ignored-modules=helpers,pytest,PyQt5'] +
-            sys.argv[2:] + files)
+    args = [
+        '--disable={}'.format(','.join(disabled)),
+        '--ignored-modules=helpers,pytest,PyQt5',
+        r'--ignore-long-lines=(<?https?://|^# Copyright 201\d)|^ *def [a-z]',
+        r'--method-rgx=[a-z_][A-Za-z0-9_]{1,100}$',
+    ] + sys.argv[2:] + files
     env = os.environ.copy()
     env['PYTHONPATH'] = os.pathsep.join(pythonpath)
 
diff --git a/tests/helpers/fixtures.py b/tests/helpers/fixtures.py
index e8321e1f1..dd36620bb 100644
--- a/tests/helpers/fixtures.py
+++ b/tests/helpers/fixtures.py
@@ -166,9 +166,7 @@ def webkit_tab(qtbot, tab_registry, cookiejar_and_cache, mode_manager,
                               private=False)
     vbox.addWidget(tab)
     # to make sure container isn't GCed
-    # pylint: disable=attribute-defined-outside-init
     tab.container = container
-    # pylint: enable=attribute-defined-outside-init
 
     with qtbot.waitExposed(container):
         container.show()
diff --git a/tests/unit/browser/test_caret.py b/tests/unit/browser/test_caret.py
index 4437d6bc3..c7e100a59 100644
--- a/tests/unit/browser/test_caret.py
+++ b/tests/unit/browser/test_caret.py
@@ -135,8 +135,7 @@ class TestBlock:
         caret.move_to_prev_word()
         selection.check("drei")
 
-    def test_moving_back_to_the_start_of_prev_block_with_sel(self,
-                                                             caret, selection):
+    def test_moving_back_to_the_start_of_prev_block_with_sel(self, caret, selection):
         caret.move_to_end_of_next_block(2)
         selection.toggle()
         caret.move_to_start_of_prev_block()
@@ -153,8 +152,7 @@ class TestBlock:
         caret.move_to_next_word()
         selection.check("eins ")
 
-    def test_moving_to_the_start_of_next_block_with_sel(self,
-                                                        caret, selection):
+    def test_moving_to_the_start_of_next_block_with_sel(self, caret, selection):
         selection.toggle()
         caret.move_to_start_of_next_block()
         selection.check("one two three\n")
@@ -290,8 +288,7 @@ class TestSearch:
 
     @pytest.mark.qtbug60673
     @pytest.mark.no_xvfb
-    def test_yanking_a_searched_line(
-            self, caret, selection, mode_manager, callback_checker, web_tab, qtbot):
+    def test_yanking_a_searched_line(self, caret, selection, mode_manager, callback_checker, web_tab, qtbot):
         web_tab.show()
         mode_manager.leave(usertypes.KeyMode.caret)
 
@@ -304,8 +301,7 @@ class TestSearch:
 
     @pytest.mark.qtbug60673
     @pytest.mark.no_xvfb
-    def test_yanking_a_searched_line_with_multiple_matches(
-            self, caret, selection, mode_manager, callback_checker, web_tab, qtbot):
+    def test_yanking_a_searched_line_with_multiple_matches(self, caret, selection, mode_manager, callback_checker, web_tab, qtbot):
         web_tab.show()
         mode_manager.leave(usertypes.KeyMode.caret)