Merged in paylogic/pytest/fix-fixturedef-merge (pull request #86)

correctly check for fixturedef when merging
2013-11-14 05:58:50 +01:00 · 2013-11-14 05:58:50 +01:00 · 4eeb1c4f31
parent c3e844e561 e2c4730e17
commit 4eeb1c4f31
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