diff options
author | Ran Benita <ran@unusedvar.com> | 2021-01-31 12:14:06 +0200 |
---|---|---|
committer | Ran Benita <ran@unusedvar.com> | 2021-02-06 20:46:08 +0200 |
commit | f42b68ccaa4a64b3f7ef1cfcff50b4f39b63ceb9 (patch) | |
tree | 551bb6ca1e2d4ff5a1905619a23a28af481b5a98 /testing/test_runner.py | |
parent | f674f6da9fec826bc8c4e08781e7309322fc12cc (diff) | |
download | pytest-f42b68ccaa4a64b3f7ef1cfcff50b4f39b63ceb9.tar.gz |
runner: rename SetupState.prepare -> setup
This is the usual terminology we use, and matches better with
`teardown_exact()` and `pytest_runtest_setup()`.
Diffstat (limited to 'testing/test_runner.py')
-rw-r--r-- | testing/test_runner.py | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/testing/test_runner.py b/testing/test_runner.py index e3f286307..abb87c6d3 100644 --- a/testing/test_runner.py +++ b/testing/test_runner.py @@ -25,7 +25,7 @@ class TestSetupState: item = pytester.getitem("def test_func(): pass") ss = item.session._setupstate values = [1] - ss.prepare(item) + ss.setup(item) ss.addfinalizer(values.pop, item) assert values ss.teardown_exact(None) @@ -34,7 +34,7 @@ class TestSetupState: def test_teardown_exact_stack_empty(self, pytester: Pytester) -> None: item = pytester.getitem("def test_func(): pass") ss = item.session._setupstate - ss.prepare(item) + ss.setup(item) ss.teardown_exact(None) ss.teardown_exact(None) ss.teardown_exact(None) @@ -49,9 +49,9 @@ class TestSetupState: ) ss = item.session._setupstate with pytest.raises(ValueError): - ss.prepare(item) + ss.setup(item) with pytest.raises(ValueError): - ss.prepare(item) + ss.setup(item) def test_teardown_multiple_one_fails(self, pytester: Pytester) -> None: r = [] @@ -67,7 +67,7 @@ class TestSetupState: item = pytester.getitem("def test_func(): pass") ss = item.session._setupstate - ss.prepare(item) + ss.setup(item) ss.addfinalizer(fin1, item) ss.addfinalizer(fin2, item) ss.addfinalizer(fin3, item) @@ -87,7 +87,7 @@ class TestSetupState: item = pytester.getitem("def test_func(): pass") ss = item.session._setupstate - ss.prepare(item) + ss.setup(item) ss.addfinalizer(fin1, item) ss.addfinalizer(fin2, item) with pytest.raises(Exception) as err: @@ -106,7 +106,7 @@ class TestSetupState: item = pytester.getitem("def test_func(): pass") mod = item.listchain()[-2] ss = item.session._setupstate - ss.prepare(item) + ss.setup(item) ss.addfinalizer(fin_module, mod) ss.addfinalizer(fin_func, item) with pytest.raises(Exception, match="oops1"): |