From 02315c04891fa04d7877761a9c85fd6ca47c49a6 Mon Sep 17 00:00:00 2001 From: Ronny Pfannschmidt Date: Wed, 21 Mar 2018 07:13:07 +0100 Subject: [PATCH] remove unnecessary of in the code figuring the fixture names --- _pytest/fixtures.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/_pytest/fixtures.py b/_pytest/fixtures.py index 457aa9d4f..27c2b2c5c 100644 --- a/_pytest/fixtures.py +++ b/_pytest/fixtures.py @@ -985,8 +985,7 @@ class FixtureManager(object): argnames = () usefixtures = flatten(uf_mark.args for uf_mark in node.find_markers("usefixtures")) initialnames = argnames - if usefixtures is not None: - initialnames = tuple(usefixtures) + initialnames + initialnames = tuple(usefixtures) + initialnames fm = node.session._fixturemanager names_closure, arg2fixturedefs = fm.getfixtureclosure(initialnames, node)