use config.getoption instead of deprecated config.getvalue
and adapt a few tests to also run against pytest-2.6.0.dev
This commit is contained in:
@@ -311,9 +311,9 @@ class TestTerminalReporting:
|
||||
""")
|
||||
result = testdir.runpytest("-n1", "-v")
|
||||
result.stdout.fnmatch_lines_random([
|
||||
"*PASS*test_pass_skip_fail.py:2: *test_ok*",
|
||||
"*SKIP*test_pass_skip_fail.py:4: *test_skip*",
|
||||
"*FAIL*test_pass_skip_fail.py:6: *test_func*",
|
||||
"*PASS*test_pass_skip_fail.py?2*test_ok*",
|
||||
"*SKIP*test_pass_skip_fail.py?4*test_skip*",
|
||||
"*FAIL*test_pass_skip_fail.py?6*test_func*",
|
||||
])
|
||||
result.stdout.fnmatch_lines([
|
||||
"*def test_func():",
|
||||
@@ -328,7 +328,7 @@ class TestTerminalReporting:
|
||||
""")
|
||||
result = testdir.runpytest("-n1", "-v")
|
||||
result.stdout.fnmatch_lines([
|
||||
"*FAIL*test_fail_platinfo.py:1: *test_func*",
|
||||
"*FAIL*test_fail_platinfo.py*1*test_func*",
|
||||
"*0*Python*",
|
||||
"*def test_func():",
|
||||
"> assert 0",
|
||||
|
||||
Reference in New Issue
Block a user