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

Merge pull request #2910 from RonnyPfannschmidt/scopenode-sanitize-specials 

switch a special case in scope node lookup to a general one
This commit is contained in:
Bruno Oliveira 2017-11-10 18:49:35 -02:00 committed by GitHub
parent c33074c8b9 0108f262b1
commit 99496d9e5b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
_pytest/fixtures.py
View File

@ -27,10 +27,12 @@ from collections import OrderedDict
def pytest_sessionstart(session): def pytest_sessionstart(session):
import _pytest.python import _pytest.python
scopename2class.update({ scopename2class.update({
'class': _pytest.python.Class, 'class': _pytest.python.Class,
'module': _pytest.python.Module, 'module': _pytest.python.Module,
'function': _pytest.main.Item, 'function': _pytest.main.Item,
'session': _pytest.main.Session,
}) })
session._fixturemanager = FixtureManager(session) session._fixturemanager = FixtureManager(session)
@ -62,8 +64,6 @@ def scopeproperty(name=None, doc=None):
def get_scope_node(node, scope): def get_scope_node(node, scope):
cls = scopename2class.get(scope) cls = scopename2class.get(scope)
if cls is None: if cls is None:
if scope == "session":
return node.session
raise ValueError("unknown scope") raise ValueError("unknown scope")
return node.getparent(cls) return node.getparent(cls)

1
changelog/2910.trivial Normal file
View File

@ -0,0 +1 @@
Internal refactoring to simplify scope node lookup.