From 119d76c502ed9a0996c9448e5e8458cf281d7895 Mon Sep 17 00:00:00 2001 From: Florian Bruhin Date: Sun, 29 May 2016 18:45:09 +0200 Subject: [PATCH] Fix lint --- tests/end2end/conftest.py | 3 ++- tests/end2end/fixtures/quteprocess.py | 2 +- tests/end2end/fixtures/webserver_sub.py | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/tests/end2end/conftest.py b/tests/end2end/conftest.py index b12c5c951..ecd7eb40a 100644 --- a/tests/end2end/conftest.py +++ b/tests/end2end/conftest.py @@ -26,7 +26,8 @@ import shutil import pstats from end2end.fixtures.webserver import httpbin, httpbin_after_test, ssl_server -from end2end.fixtures.quteprocess import quteproc_process, quteproc, quteproc_new +from end2end.fixtures.quteprocess import (quteproc_process, quteproc, + quteproc_new) from end2end.fixtures.testprocess import pytest_runtest_makereport diff --git a/tests/end2end/fixtures/quteprocess.py b/tests/end2end/fixtures/quteprocess.py index 0dbd45a7e..69392d673 100644 --- a/tests/end2end/fixtures/quteprocess.py +++ b/tests/end2end/fixtures/quteprocess.py @@ -297,7 +297,7 @@ class QuteProc(testprocess.Process): if skip_texts: pytest.skip(', '.join(skip_texts)) - def after_test(self, did_fail): # pylint: disable=arguments-differ + def after_test(self, did_fail): """Handle unexpected/skip logging and clean up after each test. Args: diff --git a/tests/end2end/fixtures/webserver_sub.py b/tests/end2end/fixtures/webserver_sub.py index aef4186d7..8ada77bb6 100644 --- a/tests/end2end/fixtures/webserver_sub.py +++ b/tests/end2end/fixtures/webserver_sub.py @@ -48,7 +48,8 @@ def send_data(path): basedir = os.path.realpath(os.path.dirname(sys.executable)) data_dir = os.path.join(basedir, 'end2end', 'data') else: - basedir = os.path.join(os.path.realpath(os.path.dirname(__file__)), '..') + basedir = os.path.join(os.path.realpath(os.path.dirname(__file__)), + '..') data_dir = os.path.join(basedir, 'data') print(basedir) if os.path.isdir(os.path.join(data_dir, path)):