diff options
| author | Anatoly Bubenkov <bubenkoff@gmail.com> | 2013-11-12 13:45:36 +0100 |
|---|---|---|
| committer | Anatoly Bubenkov <bubenkoff@gmail.com> | 2013-11-12 13:45:36 +0100 |
| commit | 846cf781a13ba3a98c7e3c64c18f5d0386846884 (patch) | |
| tree | 48b12c850c70129c9db583a8ce082fc38b2181c1 /_pytest | |
| parent | 85dd51ccc8f265d41af446909aab18a8e4d2448a (diff) | |
| download | pytest-846cf781a13ba3a98c7e3c64c18f5d0386846884.tar.gz | |
use deepest fixturedef for fixture closure
--HG--
branch : multi-level-fixture-deps-override
Diffstat (limited to '_pytest')
| -rw-r--r-- | _pytest/python.py | 3 |
1 files changed, 1 insertions, 2 deletions
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): |