diff options
| author |   David Schneider <david.schneider@picle.org> | 2012-07-05 14:24:53 +0200 |
|---|---|---|
| committer | David Schneider <david.schneider@picle.org> | 2012-07-05 14:24:53 +0200 |
| commit | d6bf54755408896672f24509ff2d165dc5d9c312 (patch) | |
| tree | 58744f6818daaf521aa84e538d298e58bd110318 /testrunner | |
| parent | merge default (diff) | |
| download | pypy-d6bf54755408896672f24509ff2d165dc5d9c312.tar.gz pypy-d6bf54755408896672f24509ff2d165dc5d9c312.tar.bz2 pypy-d6bf54755408896672f24509ff2d165dc5d9c312.zip | |
do not consider the file pypy/test_all.py as a test_xxx.py test file when collecting directories
Diffstat (limited to 'testrunner')
| -rw-r--r-- | testrunner/runner.py | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/testrunner/runner.py b/testrunner/runner.py index 303dba81cb..25dc5022b9 100644 --- a/testrunner/runner.py +++ b/testrunner/runner.py @@ -302,7 +302,11 @@ class RunParam(object): def is_test_py_file(self, p): name = p.basename - return name.startswith('test_') and name.endswith('.py') + # XXX avoid picking up pypy/test_all.py as a test test_xxx.py file else + # the pypy directory is not traversed and picked up as one test + # directory + return (self.reltoroot(p) != 'pypy/test_all.py' + and (name.startswith('test_') and name.endswith('.py'))) def reltoroot(self, p): rel = p.relto(self.root) |