This commit is contained in:
Florian Bruhin 2016-05-29 18:45:09 +02:00
parent 5b84fc93df
commit 119d76c502
3 changed files with 5 additions and 3 deletions

View File

@ -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

View File

@ -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:

View File

@ -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)):