Author: Ronan Lamy <[email protected]>
Branch: apptest-file
Changeset: r97029:a41d9a2f1935
Date: 2019-07-26 03:15 +0100
http://bitbucket.org/pypy/pypy/changeset/a41d9a2f1935/
Log: Make 'pytest -D' runs compatible with recent versions of pytest
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -38,15 +38,17 @@
def pytest_report_header():
return "pytest-%s from %s" % (pytest.__version__, pytest.__file__)
-def pytest_addhooks(pluginmanager):
- from rpython.conftest import LeakFinder
- pluginmanager.register(LeakFinder())
-
def pytest_configure(config):
global option
option = config.option
- if config.getoption('direct_apptest') or not
config.getoption('runappdirect'):
+ mode_A = config.getoption('runappdirect')
+ mode_D = config.getoption('direct_apptest')
+ if mode_D or not mode_A:
config.addinivalue_line('python_files', APPLEVEL_FN)
+ if not mode_A and not mode_D: # 'own' tests
+ from rpython.conftest import LeakFinder
+ config.pluginmanager.register(LeakFinder())
+ config.addinivalue_line('addopts', '--assert=reinterp')
def pytest_addoption(parser):
group = parser.getgroup("pypy options")
@@ -109,7 +111,7 @@
return isinstance(item, AppTestFunction)
def pytest_collection_modifyitems(config, items):
- if config.option.runappdirect:
+ if config.getoption('runappdirect') or config.getoption('direct_apptest'):
return
for item in items:
if isinstance(item, py.test.Function):
diff --git a/pypy/module/cpyext/test/conftest.py
b/pypy/module/cpyext/test/conftest.py
--- a/pypy/module/cpyext/test/conftest.py
+++ b/pypy/module/cpyext/test/conftest.py
@@ -2,7 +2,7 @@
import pytest
def pytest_configure(config):
- if config.option.runappdirect:
+ if config.getoption('runappdirect') or config.getoption('direct_apptest'):
import sys
import py
from pypy import pypydir
@@ -20,7 +20,8 @@
import pypy.module.cpyext.test.test_cpyext
-def pytest_funcarg__api(request):
[email protected]
+def api(request):
return request.cls.api
if os.name == 'nt':
diff --git a/pytest.ini b/pytest.ini
--- a/pytest.ini
+++ b/pytest.ini
@@ -1,2 +1,2 @@
[pytest]
-addopts = --assert=reinterp -rf
+addopts = -rf
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
