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

tests: Don't start qutebrowser process if unneeded.

Browse Source
This commit is contained in:
Florian Bruhin 2015-11-26 13:56:42 +01:00
parent fac76576d7
commit 7baed5f80f
2 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tests/integration/conftest.py
View File

@ -22,4 +22,4 @@
"""Things needed for integration testing."""
from webserver import httpbin, httpbin_after_test
from quteprocess import quteproc, quteproc_after_test
from quteprocess import quteproc_process, quteproc

16
tests/integration/quteprocess.py
View File

@ -287,8 +287,8 @@ class QuteProc(testprocess.Process):
@pytest.yield_fixture(scope='module')
def quteproc(qapp, httpbin, request):
"""Fixture for qutebrowser process."""
def quteproc_process(qapp, httpbin, request):
"""Fixture for qutebrowser process which is started once per file."""
delay = request.config.getoption('--qute-delay')
proc = QuteProc(httpbin, delay)
proc.start()
@ -296,9 +296,9 @@ def quteproc(qapp, httpbin, request):
proc.terminate()
@pytest.yield_fixture(autouse=True)
def quteproc_after_test(quteproc):
"""Fixture to run cleanup tasks after each test."""
quteproc.before_test()
yield
quteproc.after_test()
@pytest.yield_fixture
def quteproc(quteproc_process, httpbin):
"""Per-test qutebrowser fixture which uses the per-file process."""
quteproc_process.before_test()
yield quteproc_process
quteproc_process.after_test()