[pypy-svn] r10919 - pypy/dist/pypy/lib/test2
hpk at codespeak.net
hpk at codespeak.net
Wed Apr 20 15:24:31 CEST 2005
Author: hpk
Date: Wed Apr 20 15:24:31 2005
New Revision: 10919
Modified:
pypy/dist/pypy/lib/test2/conftest.py
Log:
hack out pypy/lib dir for running against CPython
(it gets inserted because importing the conftest
file adds it ... hum)
Modified: pypy/dist/pypy/lib/test2/conftest.py
==============================================================================
--- pypy/dist/pypy/lib/test2/conftest.py (original)
+++ pypy/dist/pypy/lib/test2/conftest.py Wed Apr 20 15:24:31 2005
@@ -18,9 +18,17 @@
sys.modules[dottedname] = mod
return mod
-libtest = py.path.local(pypy.__file__).dirpath()
-libtest = libtest.dirpath('lib-python-2.3.4', 'test')
-libconftest = libtest.join('conftest.py').getpymodule() # read())
+pypydir = py.path.local(pypy.__file__).dirpath()
+
+# hack out pypy/lib -> XXX we need to restructure our test2 situation
+pypylibdir = pypydir.join('lib')
+if str(pypylibdir) in sys.path:
+ print "warning, %s on sys.path at cpython level, removing it" % pypylibdir
+ sys.path.remove(str(pypylibdir))
+assert str(pypylibdir) not in sys.path
+
+libtestdir = pypydir.dirpath('lib-python-2.3.4', 'test')
+libconftest = libtestdir.join('conftest.py').getpymodule() # read())
testlist = None
doctestmodulelist = None
@@ -30,7 +38,7 @@
if testlist is None:
testlist = []
doctestmodulelist = []
- mod = make_cpy_module('unittest', libtest.join('pypy_unittest.py', force=True))
+ mod = make_cpy_module('unittest', libtestdir.join('pypy_unittest.py', force=True))
mod.raises = py.test.raises
def hack_run_unittest(*classes):
More information about the Pypy-commit
mailing list