p53209761
/
test_ok2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

testing: fix some tests to be more realistic 

Perform the operations in the order and context in which they can
legally occur.
This commit is contained in:
Ran Benita 2021-01-01 16:05:54 +02:00
parent c83d030028
commit 637300d13d
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
testing/python/fixtures.py
View File

@ -130,7 +130,8 @@ class TestFillFixtures:
pytester.copy_example() pytester.copy_example()
item = pytester.getitem(Path("test_funcarg_basic.py")) item = pytester.getitem(Path("test_funcarg_basic.py"))
assert isinstance(item, Function) assert isinstance(item, Function)
item._request._fillfixtures() # Execute's item's setup, which fills fixtures.
item.session._setupstate.prepare(item)
del item.funcargs["request"] del item.funcargs["request"]
assert len(get_public_names(item.funcargs)) == 2 assert len(get_public_names(item.funcargs)) == 2
assert item.funcargs["some"] == "test_func" assert item.funcargs["some"] == "test_func"
@ -809,18 +810,25 @@ class TestRequestBasic:
item = pytester.getitem( item = pytester.getitem(
""" """
import pytest import pytest
values = [2]
@pytest.fixture @pytest.fixture
def something(request): return 1 def something(request):
return 1
values = [2]
@pytest.fixture @pytest.fixture
def other(request): def other(request):
return values.pop() return values.pop()
def test_func(something): pass def test_func(something): pass
""" """
) )
assert isinstance(item, Function) assert isinstance(item, Function)
req = item._request req = item._request
# Execute item's setup.
item.session._setupstate.prepare(item)
with pytest.raises(pytest.FixtureLookupError): with pytest.raises(pytest.FixtureLookupError):
req.getfixturevalue("notexists") req.getfixturevalue("notexists")
val = req.getfixturevalue("something") val = req.getfixturevalue("something")
@ -831,7 +839,6 @@ class TestRequestBasic:
assert val2 == 2 assert val2 == 2
val2 = req.getfixturevalue("other") # see about caching val2 = req.getfixturevalue("other") # see about caching
assert val2 == 2 assert val2 == 2
item._request._fillfixtures()
assert item.funcargs["something"] == 1 assert item.funcargs["something"] == 1
assert len(get_public_names(item.funcargs)) == 2 assert len(get_public_names(item.funcargs)) == 2
assert "request" in item.funcargs assert "request" in item.funcargs

7
testing/test_runner.py
View File

@ -104,13 +104,14 @@ class TestSetupState:
module_teardown.append("fin_module") module_teardown.append("fin_module")
item = pytester.getitem("def test_func(): pass") item = pytester.getitem("def test_func(): pass")
mod = item.listchain()[-2]
ss = item.session._setupstate ss = item.session._setupstate
ss.addfinalizer(fin_module, item.listchain()[-2])
ss.addfinalizer(fin_func, item)
ss.prepare(item) ss.prepare(item)
ss.addfinalizer(fin_module, mod)
ss.addfinalizer(fin_func, item)
with pytest.raises(Exception, match="oops1"): with pytest.raises(Exception, match="oops1"):
ss.teardown_exact(None) ss.teardown_exact(None)
assert module_teardown assert module_teardown == ["fin_module"]
class BaseFunctionalTests: class BaseFunctionalTests: