rnhmjoj/qutebrowser
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Reset the webserver process correctly between tests

Browse Source 
If we don't call before_test(), if the server shows an error, all following
tests will fail.

See #3207
This commit is contained in:
Florian Bruhin 2017-10-27 19:05:26 +02:00
parent f44985548b
commit 023c59f8c0
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/end2end/conftest.py
View File

@ -36,7 +36,7 @@ from PyQt5.QtCore import PYQT_VERSION
pytest.register_assert_rewrite('end2end.fixtures') pytest.register_assert_rewrite('end2end.fixtures')
from end2end.fixtures.webserver import server, server_after_test, ssl_server from end2end.fixtures.webserver import server, server_per_test, ssl_server
from end2end.fixtures.quteprocess import (quteproc_process, quteproc, from end2end.fixtures.quteprocess import (quteproc_process, quteproc,
quteproc_new) quteproc_new)
from end2end.fixtures.testprocess import pytest_runtest_makereport from end2end.fixtures.testprocess import pytest_runtest_makereport

3
tests/end2end/fixtures/webserver.py
View File

@ -188,9 +188,10 @@ def server(qapp):
@pytest.fixture(autouse=True) @pytest.fixture(autouse=True)
def server_after_test(server, request): def server_per_test(server, request):
"""Fixture to clean server request list after each test.""" """Fixture to clean server request list after each test."""
request.node._server_log = server.captured_log request.node._server_log = server.captured_log
server.before_test()
yield yield
server.after_test() server.after_test()