Author: Brian Kearns <[email protected]>
Branch:
Changeset: r60925:10d502e8cb87
Date: 2013-01-31 16:53 -0500
http://bitbucket.org/pypy/pypy/changeset/10d502e8cb87/
Log: fix collection of test_lib_pypy tests when runappdirect is set
(transplanted from 5acfa3319a452ba70b7b04a21525e4d66aa242a9)
diff --git a/pypy/conftest.py b/pypy/conftest.py
--- a/pypy/conftest.py
+++ b/pypy/conftest.py
@@ -84,10 +84,11 @@
if self.config.option.runappdirect:
# only collect regular tests if we are in an 'app_test' directory,
# or in test_lib_pypy
- names = self.listnames()
- return "app_test" in names or "test_lib_pypy" in names
- else:
- return True
+ for name in self.listnames():
+ if "app_test" in name or "test_lib_pypy" in name:
+ return True
+ return False
+ return True
def funcnamefilter(self, name):
if name.startswith('test_'):
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
