[pypy-commit] pypy split-rpython: Added conftestpath back to test_pytestsupport

Aquana noreply at buildbot.pypy.org
Fri Jan 18 21:31:31 CET 2013


Author: Alexander Hesse <webmaster at aquanasoft.de>
Branch: split-rpython
Changeset: r60184:6cf02861c5c4
Date: 2013-01-18 21:31 +0100
http://bitbucket.org/pypy/pypy/changeset/6cf02861c5c4/

Log:	Added conftestpath back to test_pytestsupport

diff --git a/pypy/tool/pytest/test/test_pytestsupport.py b/pypy/tool/pytest/test/test_pytestsupport.py
--- a/pypy/tool/pytest/test/test_pytestsupport.py
+++ b/pypy/tool/pytest/test/test_pytestsupport.py
@@ -9,6 +9,7 @@
 import os
 import sys
 import pypy
+conftestpath = py.path.local(pypy.__file__).dirpath("conftest.py")
 
 pytest_plugins = "pytest_pytester"
 


More information about the pypy-commit mailing list