Author: Ronan Lamy <[email protected]>
Branch: testing-cleanup
Changeset: r85015:eb94727607d8
Date: 2016-06-07 23:36 +0100
http://bitbucket.org/pypy/pypy/changeset/eb94727607d8/
Log: kill pypy/tool/pytest/inttest.py and just use regular pytest objects
for interp-level tests
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -121,9 +121,6 @@
if name.startswith('AppTest'):
from pypy.tool.pytest.apptest import AppClassCollector
return AppClassCollector(name, parent=self)
- else:
- from pypy.tool.pytest.inttest import IntClassCollector
- return IntClassCollector(name, parent=self)
elif hasattr(obj, 'func_code') and self.funcnamefilter(name):
if name.startswith('app_test_'):
@@ -131,11 +128,7 @@
"generator app level functions? you must be joking"
from pypy.tool.pytest.apptest import AppTestFunction
return AppTestFunction(name, parent=self)
- elif obj.func_code.co_flags & 32: # generator function
- return pytest.Generator(name, parent=self)
- else:
- from pypy.tool.pytest.inttest import IntTestFunction
- return IntTestFunction(name, parent=self)
+ return super(PyPyModule, self).makeitem(name, obj)
def skip_on_missing_buildoption(**ropts):
__tracebackhide__ = True
@@ -164,7 +157,7 @@
def pytest_runtest_setup(__multicall__, item):
if isinstance(item, py.test.collect.Function):
- appclass = item.getparent(PyPyClassCollector)
+ appclass = item.getparent(py.test.Class)
if appclass is not None:
# Make cls.space and cls.runappdirect available in tests.
spaceconfig = getattr(appclass.obj, 'spaceconfig', None)
diff --git a/pypy/tool/pytest/inttest.py b/pypy/tool/pytest/inttest.py
deleted file mode 100644
--- a/pypy/tool/pytest/inttest.py
+++ /dev/null
@@ -1,18 +0,0 @@
-# Collects and executes interpreter-level tests.
-#
-# Most pypy tests are of this kind.
-
-import py
-from pypy.conftest import PyPyClassCollector
-
-
-class IntTestFunction(py.test.collect.Function):
- pass
-
-
-class IntInstanceCollector(py.test.collect.Instance):
- Function = IntTestFunction
-
-
-class IntClassCollector(PyPyClassCollector):
- Instance = IntInstanceCollector
diff --git a/pypy/tool/pytest/test/test_appsupport.py
b/pypy/tool/pytest/test/test_appsupport.py
--- a/pypy/tool/pytest/test/test_appsupport.py
+++ b/pypy/tool/pytest/test/test_appsupport.py
@@ -27,11 +27,11 @@
result = testdir.runpytest("--collectonly")
assert result.ret == 0
result.stdout.fnmatch_lines([
- "*IntTestFunction*test_func*",
- "*IntClassCollector*TestClassInt*",
- "*IntTestFunction*test_method*",
+ "*Function*test_func*",
+ "*Class*TestClassInt*",
+ "*Function*test_method*",
"*AppClassCollector*AppTestClass*",
- "*AppTestMethod*",
+ "*AppTestMethod*",
])
class TestSpaceConfig:
@@ -133,5 +133,5 @@
x = 43
info = raises(ZeroDivisionError, "x/0")
- assert info.type is ZeroDivisionError
- assert isinstance(info.value, ZeroDivisionError)
+ assert info.type is ZeroDivisionError
+ assert isinstance(info.value, ZeroDivisionError)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
