Author: Ronan Lamy <[email protected]>
Branch: testing-cleanup
Changeset: r85032:449d109357aa
Date: 2016-06-08 16:59 +0100
http://bitbucket.org/pypy/pypy/changeset/449d109357aa/
Log: Apply applevel marker in the same way as interplevel
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -84,8 +84,11 @@
if config.option.runappdirect:
return
for item in items:
- if isinstance(item, py.test.Function) and not is_applevel(item):
- item.add_marker('interplevel')
+ if isinstance(item, py.test.Function)
+ if is_applevel(item):
+ item.add_marker('applevel')
+ else:
+ item.add_marker('interplevel')
class PyPyModule(py.test.collect.Module):
""" we take care of collecting classes both at app level
diff --git a/pypy/tool/pytest/apptest.py b/pypy/tool/pytest/apptest.py
--- a/pypy/tool/pytest/apptest.py
+++ b/pypy/tool/pytest/apptest.py
@@ -20,13 +20,8 @@
def __init__(self, excinfo):
self.excinfo = excinfo
-marker = py.test.mark.applevel
class AppTestFunction(py.test.collect.Function):
- def __init__(self, *args, **kwargs):
- super(AppTestFunction, self).__init__(*args, **kwargs)
- self._request.applymarker(marker)
-
def _prunetraceback(self, traceback):
return traceback
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
