correctly check for fixturedef when merging

--HG-- branch : fix-fixturedef-merge
2013-11-13 18:25:55 +01:00
parent c3e844e561
commit e2c4730e17
1 changed files with 1 additions and 1 deletions
--- a/_pytest/python.py
+++ b/_pytest/python.py
@@ -1555,7 +1555,7 @@ class FixtureManager:
                    continue
                fixturedefs = self.getfixturedefs(argname, parentid)
                arg2fixturedefs[argname] = fixturedefs
-                if fixturedefs is not None:
+                if fixturedefs:
                    merge(fixturedefs[-1].argnames)
        return fixturenames_closure, arg2fixturedefs