summaryrefslogtreecommitdiff
path: root/testing/test_session.py
diff options
context:
space:
mode:
authorholger krekel <holger@merlinux.eu>2013-08-01 17:32:19 +0200
committerholger krekel <holger@merlinux.eu>2013-08-01 17:32:19 +0200
commit8f24e10571df08349edf17c6c598e13a86439eef (patch)
tree7eb771573284be4b17648504b16b088e9a84e707 /testing/test_session.py
parent3ac36f6572b29712030b08affa39e6302e135d27 (diff)
downloadpytest-8f24e10571df08349edf17c6c598e13a86439eef.tar.gz
add changelog entry for anthon's hynek-fication of options,
and change the docs and tests to use the new style.
Diffstat (limited to 'testing/test_session.py')
-rw-r--r--testing/test_session.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/testing/test_session.py b/testing/test_session.py
index df7463e02..e8e67bde2 100644
--- a/testing/test_session.py
+++ b/testing/test_session.py
@@ -179,7 +179,7 @@ class TestNewSession(SessionTests):
test_three="xxxdsadsadsadsa",
__init__=""
)
- reprec = testdir.inline_run('--collectonly', p.dirpath())
+ reprec = testdir.inline_run('--collect-only', p.dirpath())
itemstarted = reprec.getcalls("pytest_itemcollected")
assert len(itemstarted) == 3
@@ -238,5 +238,5 @@ def test_sessionfinish_with_start(testdir):
assert l[0] == os.getcwd()
""")
- res = testdir.runpytest("--collectonly")
+ res = testdir.runpytest("--collect-only")
assert res.ret == 0