Merge pull request #12037 from bluetech/fixtures-getnextfixturedef-parent
fixtures: remove unneeded optimization from `_getnextfixturedef`
This commit is contained in:
		
						commit
						c967d508d6
					
				| 
						 | 
					@ -413,9 +413,7 @@ class FixtureRequest(abc.ABC):
 | 
				
			||||||
            # We arrive here because of a dynamic call to
 | 
					            # We arrive here because of a dynamic call to
 | 
				
			||||||
            # getfixturevalue(argname) usage which was naturally
 | 
					            # getfixturevalue(argname) usage which was naturally
 | 
				
			||||||
            # not known at parsing/collection time.
 | 
					            # not known at parsing/collection time.
 | 
				
			||||||
            parent = self._pyfuncitem.parent
 | 
					            fixturedefs = self._fixturemanager.getfixturedefs(argname, self._pyfuncitem)
 | 
				
			||||||
            assert parent is not None
 | 
					 | 
				
			||||||
            fixturedefs = self._fixturemanager.getfixturedefs(argname, parent)
 | 
					 | 
				
			||||||
            if fixturedefs is not None:
 | 
					            if fixturedefs is not None:
 | 
				
			||||||
                self._arg2fixturedefs[argname] = fixturedefs
 | 
					                self._arg2fixturedefs[argname] = fixturedefs
 | 
				
			||||||
        # No fixtures defined with this name.
 | 
					        # No fixtures defined with this name.
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue