[pypy-svn] r66783 - pypy/branch/use-py1.0.0/pypy

[pedronis at codespeak.net]

Author: pedronis
Date: Tue Aug 11 18:04:53 2009
New Revision: 66783

Modified:
   pypy/branch/use-py1.0.0/pypy/conftest.py
Log:
workaround, do we still need the lib/py symlink

Modified: pypy/branch/use-py1.0.0/pypy/conftest.py
==============================================================================
--- pypy/branch/use-py1.0.0/pypy/conftest.py	(original)
+++ pypy/branch/use-py1.0.0/pypy/conftest.py	Tue Aug 11 18:04:53 2009
@@ -15,7 +15,13 @@
 pytest_plugins = "resultlog",
 rsyncdirs = ['.', '../lib-python', '../demo']
 rsyncignore = ['_cache']
- 
+
+# XXX workaround for a py.test bug clashing with lib/py bug
+# do we really need the latter?
+empty_conftest = type(sys)('conftest')
+empty_conftest.__file__ = "?"
+sys.modules['pypy.lib.py.conftest'] = empty_conftest
+
 # PyPy's command line extra options (these are added 
 # to py.test's standard options) 
 #