[pypy-svn] pypy commit d9ae597a7238: yet another tweak to the conftest

Bitbucket commits-noreply at bitbucket.org
Wed Dec 15 16:06:30 CET 2010


# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Antonio Cuni <anto.cuni at gmail.com>
# Date 1292425577 -3600
# Node ID d9ae597a7238bd37c646b482a18504e4c993fa2d
# Parent  b750078b8df4fa93384aadf0785dcfb7a82f4b1e
yet another tweak to the conftest

--- a/pypy/module/cpyext/conftest.py
+++ b/pypy/module/cpyext/conftest.py
@@ -1,12 +1,12 @@
 import py
 from pypy.conftest import option, gettestobjspace
 
-def pytest_collect_directory(parent):
-    if parent.config.option.runappdirect:
-        py.test.skip("cannot be run by py.test -A")
-
+def pytest_ignore_collect(path, config):
+    if config.option.runappdirect:
+        return True # "cannot be run by py.test -A"
     # ensure additional functions are registered
     import pypy.module.cpyext.test.test_cpyext
+    return False
 
 def pytest_funcarg__space(request):
     return gettestobjspace(usemodules=['cpyext', 'thread'])



More information about the Pypy-commit mailing list