[pypy-svn] r75098 - pypy/trunk/lib-python

[arigo at codespeak.net]

Author: arigo
Date: Fri Jun  4 11:13:54 2010
New Revision: 75098

Modified:
   pypy/trunk/lib-python/conftest.py
Log:
Revert r75092.  It causes massive failures of the nightly applevel tests.
I think (by running pypy-c py.test --collect) that it is because in this
case it causes py.test to try to collect far more stuff, including both
the 2.5.2/test and the modified-2.5.2/test version of the same test.


Modified: pypy/trunk/lib-python/conftest.py
==============================================================================
--- pypy/trunk/lib-python/conftest.py	(original)
+++ pypy/trunk/lib-python/conftest.py	Fri Jun  4 11:13:54 2010
@@ -532,8 +532,7 @@
         return l 
 
 def pytest_collect_directory(parent, path):
-    if path.basename == "test":
-        return RegrDirectory(path, parent)
+    return RegrDirectory(path, parent)
 
 class RunFileExternal(py.test.collect.File):
     def __init__(self, name, parent, regrtest):