[pypy-svn] pypy commit 594f56f4cede: move also this conftest, else py.test does not find it

[Bitbucket]

# HG changeset patch -- Bitbucket.org
# Project pypy
# URL http://bitbucket.org/pypy/pypy/overview
# User Antonio Cuni <anto.cuni at gmail.com>
# Date 1292323289 -3600
# Node ID 594f56f4cede7c763dca05d1ac0693f40a9b76d0
# Parent  a1d660058003b0c82e864c81be80b8093855cfc0
move also this conftest, else py.test does not find it

--- a/pypy/module/cpyext/test/conftest.py
+++ /dev/null
@@ -1,16 +0,0 @@
-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")
-
-    # ensure additional functions are registered
-    import pypy.module.cpyext.test.test_cpyext
-
-def pytest_funcarg__space(request):
-    return gettestobjspace(usemodules=['cpyext', 'thread'])
-
-def pytest_funcarg__api(request):
-    return request.cls.api
-

--- /dev/null
+++ b/pypy/module/cpyext/conftest.py
@@ -0,0 +1,16 @@
+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")
+
+    # ensure additional functions are registered
+    import pypy.module.cpyext.test.test_cpyext
+
+def pytest_funcarg__space(request):
+    return gettestobjspace(usemodules=['cpyext', 'thread'])
+
+def pytest_funcarg__api(request):
+    return request.cls.api
+