floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove unnecessary of in the code figuring the fixture names

This commit is contained in:
Ronny Pfannschmidt 2018-03-21 07:13:07 +01:00
parent a92a51b01b
commit 02315c0489
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
_pytest/fixtures.py
View File

@ -985,8 +985,7 @@ class FixtureManager(object):
argnames = () argnames = ()
usefixtures = flatten(uf_mark.args for uf_mark in node.find_markers("usefixtures")) usefixtures = flatten(uf_mark.args for uf_mark in node.find_markers("usefixtures"))
initialnames = argnames initialnames = argnames
if usefixtures is not None: initialnames = tuple(usefixtures) + initialnames
initialnames = tuple(usefixtures) + initialnames
fm = node.session._fixturemanager fm = node.session._fixturemanager
names_closure, arg2fixturedefs = fm.getfixtureclosure(initialnames, names_closure, arg2fixturedefs = fm.getfixtureclosure(initialnames,
node) node)