[pypy-svn] r58630 - pypy/dist/pypy

[hpk at codespeak.net]

Author: hpk
Date: Mon Oct  6 14:04:10 2008
New Revision: 58630

Modified:
   pypy/dist/pypy/conftest.py
Log:
dont use deprecated run() method.
 


Modified: pypy/dist/pypy/conftest.py
==============================================================================
--- pypy/dist/pypy/conftest.py	(original)
+++ pypy/dist/pypy/conftest.py	Mon Oct  6 14:04:10 2008
@@ -484,12 +484,11 @@
 
 
 class Directory(py.test.collect.Directory):
-    def run(self):
-        # hack to exclude lib/ctypes/
-        if self.fspath == rootdir.join('lib', 'ctypes', 'test'):
+    def consider_dir(self, path, usefilters=True):
+        if path == rootdir.join("lib", "ctypes", "test"):
             py.test.skip("These are the original ctypes tests.\n"
                          "You can try to run them with 'pypy-c runtests.py'.")
-        return py.test.collect.Directory.run(self)
+        return super(Directory, self).consider_dir(path, usefilters=usefilters)
 
     def recfilter(self, path):
         # disable recursion in symlinked subdirectories