diff options
| author | holger krekel <holger@merlinux.eu> | 2013-11-14 05:58:50 +0100 |
|---|---|---|
| committer | holger krekel <holger@merlinux.eu> | 2013-11-14 05:58:50 +0100 |
| commit | 4eeb1c4f316d9ef0943ec6a2db3f4afbc7ada8fb (patch) | |
| tree | a1c5c7905ffd45f3410a351806b7ce16b20d607d | |
| parent | c3e844e5611b84142431d26052996cc061f3c30e (diff) | |
| parent | e2c4730e17bd418a5d26a3112fcfbbe88c7e7d68 (diff) | |
| download | pytest-4eeb1c4f316d9ef0943ec6a2db3f4afbc7ada8fb.tar.gz | |
Merged in paylogic/pytest/fix-fixturedef-merge (pull request #86)
correctly check for fixturedef when merging
| -rw-r--r-- | _pytest/python.py | 2 |
1 files changed, 1 insertions, 1 deletions
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 |