Author: Ronny Pfannschmidt <[email protected]>
Branch: split-rpython
Changeset: r60177:2e610d355c7e
Date: 2013-01-18 16:16 +0100
http://bitbucket.org/pypy/pypy/changeset/2e610d355c7e/
Log: kill remainders of expecttest in pypy
also fixme notes for defered fixes to the expecttest plugin
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -113,16 +113,6 @@
if name.startswith('AppTest'):
from pypy.tool.pytest.apptest import AppClassCollector
return AppClassCollector(name, parent=self)
- elif name.startswith('ExpectTest'):
- if self.config.option.rundirect:
- return py.test.collect.Class(name, parent=self)
- from pypy.tool.pytest.expecttest import ExpectClassCollector
- return ExpectClassCollector(name, parent=self)
- # XXX todo
- #elif name.startswith('AppExpectTest'):
- # if option.rundirect:
- # return AppClassCollector(name, parent=self)
- # return AppExpectClassCollector(name, parent=self)
else:
from pypy.tool.pytest.inttest import IntClassCollector
return IntClassCollector(name, parent=self)
diff --git a/rpython/tool/pytest/expecttest.py
b/rpython/tool/pytest/expecttest.py
--- a/rpython/tool/pytest/expecttest.py
+++ b/rpython/tool/pytest/expecttest.py
@@ -72,7 +72,10 @@
except ImportError:
py.test.skip("pexpect not found")
+
@py.test.mark.tryfirst
def pytest_pycollect_makeitem(collector, name, obj):
if py.std.inspect.isclass(obj) and name.startswith('ExpectTest'):
+ #XXX: in conftest we had a rundirect option
+ #XXX: kill expecttest for a more explicit way
return ExpectClassCollector(name, parent=collector)
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
