add changelog entry for anthon's hynek-fication of options,

and change the docs and tests to use the new style.
This commit is contained in:
holger krekel
2013-08-01 17:32:19 +02:00
parent 3ac36f6572
commit 8f24e10571
19 changed files with 45 additions and 39 deletions

View File

@@ -414,7 +414,7 @@ class TestConftestCustomization:
""")
testdir.makepyfile("def test_some(): pass")
testdir.makepyfile(test_xyz="def test_func(): pass")
result = testdir.runpytest("--collectonly")
result = testdir.runpytest("--collect-only")
result.stdout.fnmatch_lines([
"*<Module*test_pytest*",
"*<MyModule*xyz*",
@@ -467,7 +467,7 @@ class TestConftestCustomization:
return MyFunction(name, collector)
""")
testdir.makepyfile("def some(): pass")
result = testdir.runpytest("--collectonly")
result = testdir.runpytest("--collect-only")
result.stdout.fnmatch_lines([
"*MyFunction*some*",
])
@@ -648,7 +648,7 @@ def test_customized_python_discovery(testdir):
""")
p2 = p.new(basename=p.basename.replace("test", "check"))
p.move(p2)
result = testdir.runpytest("--collectonly", "-s")
result = testdir.runpytest("--collect-only", "-s")
result.stdout.fnmatch_lines([
"*check_customized*",
"*check_simple*",
@@ -672,7 +672,7 @@ def test_customized_python_discovery_functions(testdir):
def _test_underscore():
pass
""")
result = testdir.runpytest("--collectonly", "-s")
result = testdir.runpytest("--collect-only", "-s")
result.stdout.fnmatch_lines([
"*_test_underscore*",
])
@@ -721,7 +721,7 @@ def test_customize_through_attributes(testdir):
def test_hello(self):
pass
""")
result = testdir.runpytest("--collectonly")
result = testdir.runpytest("--collect-only")
result.stdout.fnmatch_lines([
"*MyClass*",
"*MyInstance*",

View File

@@ -31,7 +31,7 @@ class TestFillFixtures:
def test_func(some):
pass
""")
result = testdir.runpytest() # "--collectonly")
result = testdir.runpytest() # "--collect-only")
assert result.ret != 0
result.stdout.fnmatch_lines([
"*def test_func(some)*",

View File

@@ -594,7 +594,7 @@ class TestMetafuncFunctional:
def test_it(foo):
pass
""")
reprec = testdir.inline_run("--collectonly")
reprec = testdir.inline_run("--collect-only")
assert not reprec.getcalls("pytest_internalerror")
def test_usefixtures_seen_in_generate_tests(self, testdir):