jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

correctly check for fixturedef when merging 

--HG--
branch : fix-fixturedef-merge
This commit is contained in:
Anatoly Bubenkov 2013-11-13 18:25:55 +01:00
parent c3e844e561
commit e2c4730e17
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
_pytest/python.py
View File

@ -1555,7 +1555,7 @@ class FixtureManager:
continue continue
fixturedefs = self.getfixturedefs(argname, parentid) fixturedefs = self.getfixturedefs(argname, parentid)
arg2fixturedefs[argname] = fixturedefs arg2fixturedefs[argname] = fixturedefs
if fixturedefs is not None: if fixturedefs:
merge(fixturedefs[-1].argnames) merge(fixturedefs[-1].argnames)
return fixturenames_closure, arg2fixturedefs return fixturenames_closure, arg2fixturedefs