From 846cf781a13ba3a98c7e3c64c18f5d0386846884 Mon Sep 17 00:00:00 2001 From: Anatoly Bubenkov Date: Tue, 12 Nov 2013 13:45:36 +0100 Subject: use deepest fixturedef for fixture closure --HG-- branch : multi-level-fixture-deps-override --- _pytest/python.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to '_pytest') diff --git a/_pytest/python.py b/_pytest/python.py index 4c742c668..085e445be 100644 --- a/_pytest/python.py +++ b/_pytest/python.py @@ -1556,8 +1556,7 @@ class FixtureManager: fixturedefs = self.getfixturedefs(argname, parentid) arg2fixturedefs[argname] = fixturedefs if fixturedefs is not None: - for fixturedef in fixturedefs: - merge(fixturedef.argnames) + merge(fixturedefs[-1].argnames) return fixturenames_closure, arg2fixturedefs def pytest_generate_tests(self, metafunc): -- cgit v1.2.3