summaryrefslogtreecommitdiff
path: root/testing/test_collection.py
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2011-03-06 18:32:00 +0100
committerholger krekel <holger@merlinux.eu>2011-03-06 18:32:00 +0100
commitc552b58dc5e2f1cba7c1e8db9e2d666aeff78db9 (patch)
tree977fa967d112fd39ed0828368ec45111d69ba1c5 /testing/test_collection.py
parent18e784c9c92f581c2e2385ec991e19182e0221a1 (diff)
downloadpytest-c552b58dc5e2f1cba7c1e8db9e2d666aeff78db9.tar.gz
fix issue27 - --collectonly and -k keyword selection now work together.
internally, collectonly and terminal reporting has been unified.
Diffstat (limited to 'testing/test_collection.py')
-rw-r--r--testing/test_collection.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/testing/test_collection.py b/testing/test_collection.py
index 3ee040dd3..564b5bc63 100644
--- a/testing/test_collection.py
+++ b/testing/test_collection.py
@@ -94,6 +94,8 @@ class TestCollectFS:
tmpdir.ensure(".whatever", 'test_notfound.py')
tmpdir.ensure(".bzr", 'test_notfound.py')
tmpdir.ensure("normal", 'test_found.py')
+ for x in tmpdir.visit("test_*.py"):
+ x.write("def test_hello(): pass")
result = testdir.runpytest("--collectonly")
s = result.stdout.str()