[pypy-commit] pypy testing-cleanup: Kill PyPyClassCollector

[rlamy]

Author: Ronan Lamy <ronan.lamy at gmail.com>
Branch: testing-cleanup
Changeset: r85031:01ebecff75ed
Date: 2016-06-08 16:50 +0100
http://bitbucket.org/pypy/pypy/changeset/01ebecff75ed/

Log:	Kill PyPyClassCollector

diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -171,9 +171,5 @@
     __multicall__.execute()
 
 
-class PyPyClassCollector(py.test.collect.Class):
-    pass
-
-
 def pytest_ignore_collect(path):
     return path.check(link=1)
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
@@ -13,7 +13,6 @@
 from pypy.interpreter.function import Method
 from pypy.tool.pytest import appsupport
 from pypy.tool.pytest.objspace import gettestobjspace
-from pypy.conftest import PyPyClassCollector
 from inspect import getmro
 
 
@@ -122,7 +121,7 @@
             self.w_instance = space.call_function(w_class)
 
 
-class AppClassCollector(PyPyClassCollector):
+class AppClassCollector(py.test.Class):
     Instance = AppClassInstance
 
     def setup(self):