From e2c4730e17bd418a5d26a3112fcfbbe88c7e7d68 Mon Sep 17 00:00:00 2001 From: Anatoly Bubenkov Date: Wed, 13 Nov 2013 18:25:55 +0100 Subject: [PATCH] correctly check for fixturedef when merging --HG-- branch : fix-fixturedef-merge --- _pytest/python.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/_pytest/python.py b/_pytest/python.py index 085e445be..c09fc6f36 100644 --- 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