diff --git a/testing/python/collect.py b/testing/python/collect.py index 2fbdf76f7..15b7c2db3 100644 --- a/testing/python/collect.py +++ b/testing/python/collect.py @@ -15,7 +15,7 @@ class TestModule: p.pyimport() del py.std.sys.modules['test_whatever'] b.ensure("test_whatever.py") - result = testdir.runpytest_inprocess() + result = testdir.runpytest() result.stdout.fnmatch_lines([ "*import*mismatch*", "*imported*test_whatever*", @@ -59,7 +59,7 @@ class TestClass: def __init__(self): pass """) - result = testdir.runpytest_inprocess("-rw") + result = testdir.runpytest("-rw") result.stdout.fnmatch_lines_random(""" WC1*test_class_with_init_warning.py*__init__* """) @@ -69,7 +69,7 @@ class TestClass: class test(object): pass """) - result = testdir.runpytest_inprocess() + result = testdir.runpytest() result.stdout.fnmatch_lines([ "*collected 0*", ]) @@ -86,7 +86,7 @@ class TestClass: def teardown_class(cls): pass """) - result = testdir.runpytest_inprocess() + result = testdir.runpytest() result.stdout.fnmatch_lines([ "*1 passed*", ]) @@ -534,7 +534,7 @@ class TestConftestCustomization: """) testdir.makepyfile("def test_some(): pass") testdir.makepyfile(test_xyz="def test_func(): pass") - result = testdir.runpytest_inprocess("--collect-only") + result = testdir.runpytest("--collect-only") result.stdout.fnmatch_lines([ "* 0 assert "hello" not in result.stdout.str() - result = testdir.runpytest_inprocess("-rw") + result = testdir.runpytest("-rw") result.stdout.fnmatch_lines(""" ===*warning summary*=== *WT1*test_warn_on_test_item*:5*hello* diff --git a/testing/test_nose.py b/testing/test_nose.py index 58ccdfcb6..76873a834 100644 --- a/testing/test_nose.py +++ b/testing/test_nose.py @@ -18,7 +18,7 @@ def test_nose_setup(testdir): test_hello.setup = lambda: l.append(1) test_hello.teardown = lambda: l.append(2) """) - result = testdir.runpytest_inprocess(p, '-p', 'nose') + result = testdir.runpytest(p, '-p', 'nose') result.assert_outcomes(passed=2) @@ -63,7 +63,7 @@ def test_nose_setup_func(testdir): assert l == [1,2] """) - result = testdir.runpytest_inprocess(p, '-p', 'nose') + result = testdir.runpytest(p, '-p', 'nose') result.assert_outcomes(passed=2) @@ -85,7 +85,7 @@ def test_nose_setup_func_failure(testdir): assert l == [1,2] """) - result = testdir.runpytest_inprocess(p, '-p', 'nose') + result = testdir.runpytest(p, '-p', 'nose') result.stdout.fnmatch_lines([ "*TypeError: ()*" ]) @@ -136,7 +136,7 @@ def test_nose_setup_partial(testdir): test_hello.setup = my_setup_partial test_hello.teardown = my_teardown_partial """) - result = testdir.runpytest_inprocess(p, '-p', 'nose') + result = testdir.runpytest(p, '-p', 'nose') result.stdout.fnmatch_lines([ "*2 passed*" ]) @@ -203,7 +203,7 @@ def test_nose_test_generator_fixtures(testdir): #expect.append('setup') eq_(self.called, expect) """) - result = testdir.runpytest_inprocess(p, '-p', 'nose') + result = testdir.runpytest(p, '-p', 'nose') result.stdout.fnmatch_lines([ "*10 passed*" ]) @@ -234,7 +234,7 @@ def test_module_level_setup(testdir): assert items[2] == 2 assert 1 not in items """) - result = testdir.runpytest_inprocess('-p', 'nose') + result = testdir.runpytest('-p', 'nose') result.stdout.fnmatch_lines([ "*2 passed*", ]) @@ -256,7 +256,7 @@ def test_nose_style_setup_teardown(testdir): def test_world(): assert l == [1] """) - result = testdir.runpytest_inprocess('-p', 'nose') + result = testdir.runpytest('-p', 'nose') result.stdout.fnmatch_lines([ "*2 passed*", ]) @@ -272,7 +272,7 @@ def test_nose_setup_ordering(testdir): def test_first(self): pass """) - result = testdir.runpytest_inprocess() + result = testdir.runpytest() result.stdout.fnmatch_lines([ "*1 passed*", ]) @@ -297,7 +297,7 @@ def test_apiwrapper_problem_issue260(testdir): def test_fun(self): pass """) - result = testdir.runpytest_inprocess() + result = testdir.runpytest() result.assert_outcomes(passed=1) @pytest.mark.skipif("sys.version_info < (2,6)") @@ -323,7 +323,7 @@ def test_setup_teardown_linking_issue265(testdir): """Undoes the setup.""" raise Exception("should not call teardown for skipped tests") ''') - reprec = testdir.runpytest_inprocess() + reprec = testdir.runpytest() reprec.assert_outcomes(passed=1, skipped=1) @@ -334,7 +334,7 @@ def test_SkipTest_during_collection(testdir): def test_failing(): assert False """) - result = testdir.runpytest_inprocess(p) + result = testdir.runpytest(p) result.assert_outcomes(skipped=1)