[pypy-svn] r10757 - pypy/dist/pypy/lib/test2

[hpk at codespeak.net]

Author: hpk
Date: Sun Apr 17 00:40:29 2005
New Revision: 10757

Modified:
   pypy/dist/pypy/lib/test2/conftest.py
Log:
- intermediate 

- get rid of the conftest import for now 
  (it causes problems on non-python2.3 versions, 
   thanks samuele for finding it out) 

- lib/test2 is currenty not testable via py.test 
  (but wasn't really before ...) 



Modified: pypy/dist/pypy/lib/test2/conftest.py
==============================================================================
--- pypy/dist/pypy/lib/test2/conftest.py	(original)
+++ pypy/dist/pypy/lib/test2/conftest.py	Sun Apr 17 00:40:29 2005
@@ -19,14 +19,14 @@
 
 libtest = py.path.local(pypy.__file__).dirpath()
 libtest = libtest.dirpath('lib-python-2.3.4', 'test')
-conftest = libtest.join('conftest.py').pyimport()
+#conftest = libtest.join('conftest.py').pyimport()
 
 def Module(fspath, parent=None): 
     if option.allpypy: 
         return conftest.Module(fspath, parent=parent) 
     return UnittestModuleOnCPython(fspath, parent=parent) 
 
-class Directory(conftest.Directory): 
+class Directory(py.test.collect.Directory): 
     def run(self): 
         return []