Skip to content

Fix support for pytest 4.1 #45

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 7, 2019
Merged

Fix support for pytest 4.1 #45

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7859b6
Remove pytest_namespace hook usage
nicoddemus Jan 7, 2019
a410b8c
Do not use deprecated pytest.config
nicoddemus Jan 7, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions pytest_twisted.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,9 @@ class _instances:
reactor = None


def pytest_namespace():
return {"inlineCallbacks": inlineCallbacks, "blockon": blockon}
def pytest_configure():
pytest.inlineCallbacks = inlineCallbacks
pytest.blockon = blockon


def blockon(d):
Expand Down
30 changes: 14 additions & 16 deletions testing/test_basic.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,12 +29,10 @@ def format_run_result_output_for_assert(run_result):
)


def skip_if_reactor_not(expected_reactor):
actual_reactor = pytest.config.getoption("reactor", "default")
return pytest.mark.skipif(
actual_reactor != expected_reactor,
reason="reactor is {} not {}".format(actual_reactor, expected_reactor),
)
def skip_if_reactor_not(request, expected_reactor):
actual_reactor = request.config.getoption("reactor", "default")
if actual_reactor != expected_reactor:
pytest.skip("reactor is {} not {}".format(actual_reactor, expected_reactor))


@pytest.fixture
Expand Down Expand Up @@ -165,8 +163,8 @@ def test_succeed(foo):
assert_outcomes(rr, {"passed": 2, "failed": 1})


@skip_if_reactor_not("default")
def test_blockon_in_hook(testdir, cmd_opts):
def test_blockon_in_hook(testdir, cmd_opts, request):
skip_if_reactor_not(request, "default")
conftest_file = """
import pytest_twisted as pt
from twisted.internet import reactor, defer
Expand All @@ -193,8 +191,8 @@ def test_succeed():
assert_outcomes(rr, {"passed": 1})


@skip_if_reactor_not("default")
def test_wrong_reactor(testdir, cmd_opts):
def test_wrong_reactor(testdir, cmd_opts, request):
skip_if_reactor_not(request, "default")
conftest_file = """
def pytest_addhooks():
import twisted.internet.reactor
Expand All @@ -210,8 +208,8 @@ def test_succeed():
assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()


@skip_if_reactor_not("qt5reactor")
def test_blockon_in_hook_with_qt5reactor(testdir, cmd_opts):
def test_blockon_in_hook_with_qt5reactor(testdir, cmd_opts, request):
skip_if_reactor_not(request, "qt5reactor")
conftest_file = """
import pytest_twisted as pt
import pytestqt
Expand Down Expand Up @@ -240,8 +238,8 @@ def test_succeed():
assert_outcomes(rr, {"passed": 1})


@skip_if_reactor_not("qt5reactor")
def test_wrong_reactor_with_qt5reactor(testdir, cmd_opts):
def test_wrong_reactor_with_qt5reactor(testdir, cmd_opts, request):
skip_if_reactor_not(request, "qt5reactor")
conftest_file = """
def pytest_addhooks():
import twisted.internet.default
Expand All @@ -257,8 +255,8 @@ def test_succeed():
assert "WrongReactorAlreadyInstalledError" in rr.stderr.str()


@skip_if_reactor_not("default")
def test_pytest_from_reactor_thread(testdir):
def test_pytest_from_reactor_thread(testdir, request):
skip_if_reactor_not(request, "default")
test_file = """
import pytest
import pytest_twisted
Expand Down
4 changes: 2 additions & 2 deletions tox.ini
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ deps=
qt5reactor: pyqt5
win: pywin32
commands=
defaultreactor: py.test --reactor=default
qt5reactor: py.test --reactor=qt5reactor
defaultreactor: pytest --reactor=default
qt5reactor: pytest --reactor=qt5reactor
sitepackages=False

[testenv:linting]
Expand Down