[pypy-svn] r47585 - pypy/dist/pypy

[fijal at codespeak.net]

Author: fijal
Date: Fri Oct 19 15:49:28 2007
New Revision: 47585

Modified:
   pypy/dist/pypy/conftest.py
Log:
Adapt conftest.py to new py.test interface


Modified: pypy/dist/pypy/conftest.py
==============================================================================
--- pypy/dist/pypy/conftest.py	(original)
+++ pypy/dist/pypy/conftest.py	Fri Oct 19 15:49:28 2007
@@ -282,10 +282,8 @@
 _pygame_imported = False
 
 class IntTestFunction(PyPyTestFunction):
-    def _haskeyword(self, keyword):
-        if keyword == 'interplevel':
-            return True 
-        return super(IntTestFunction, self)._haskeyword(keyword)
+    def _keywords(self):
+        return super(IntTestFunction, self)._keywords + ['interplevel']
 
     def execute(self, target, *args):
         co = target.func_code
@@ -315,8 +313,8 @@
                                      "if conftest.option.view is False")
 
 class AppTestFunction(PyPyTestFunction): 
-    def _haskeyword(self, keyword):
-        return keyword == 'applevel' or super(AppTestFunction, self)._haskeyword(keyword)
+    def _keywords(self):
+        return ['applevel'] + super(AppTestFunction, self)._keywords()
 
     def execute(self, target, *args):
         assert not args 
@@ -363,9 +361,8 @@
 class IntClassCollector(PyPyClassCollector): 
     Function = IntTestFunction 
 
-    def _haskeyword(self, keyword):
-        return keyword == 'interplevel' or \
-               super(IntClassCollector, self)._haskeyword(keyword)
+    def _keywords(self):
+        return super(IntClassCollector, self)._keywords() + ['interplevel']
 
 class AppClassInstance(py.test.collect.Instance): 
     Function = AppTestMethod 
@@ -383,9 +380,8 @@
 class AppClassCollector(PyPyClassCollector): 
     Instance = AppClassInstance 
 
-    def _haskeyword(self, keyword):
-        return keyword == 'applevel' or \
-               super(AppClassCollector, self)._haskeyword(keyword)
+    def _keywords(self):
+        return super(AppClassCollector, self)._keywords() + ['applevel']
 
     def setup(self): 
         super(AppClassCollector, self).setup()