From de377c10014eb35ed3248acbc54b518b3a4177fd Mon Sep 17 00:00:00 2001 From: holger krekel Date: Wed, 14 May 2014 08:13:56 +0200 Subject: [PATCH] use config.getoption instead of deprecated config.getvalue and adapt a few tests to also run against pytest-2.6.0.dev --- testing/acceptance_test.py | 8 ++++---- testing/conftest.py | 2 +- xdist/plugin.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index 5cf2d12..f0528eb 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -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", diff --git a/testing/conftest.py b/testing/conftest.py index 0d1097f..fbd94d8 100644 --- a/testing/conftest.py +++ b/testing/conftest.py @@ -7,7 +7,7 @@ pytest_plugins = "pytester" def pytest_addoption(parser): parser.addoption('--gx', - action="append", dest="gspecs", default=None, + action="append", dest="gspecs", help=("add a global test environment, XSpec-syntax. ")) def pytest_funcarg__specssh(request): diff --git a/xdist/plugin.py b/xdist/plugin.py index b91f83d..bc32104 100644 --- a/xdist/plugin.py +++ b/xdist/plugin.py @@ -53,14 +53,14 @@ def pytest_addhooks(pluginmanager): def pytest_cmdline_main(config): check_options(config) - if config.getvalue("looponfail"): + if config.getoption("looponfail"): from xdist.looponfail import looponfail_main looponfail_main(config) return 2 # looponfail only can get stop with ctrl-C anyway def pytest_configure(config, __multicall__): __multicall__.execute() - if config.getvalue("dist") != "no": + if config.getoption("dist") != "no": from xdist.dsession import DSession session = DSession(config) config.pluginmanager.register(session, "dsession")