summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRan Benita <ran@unusedvar.com>2021-01-01 14:42:14 +0200
committerRan Benita <ran@unusedvar.com>2021-01-01 23:15:57 +0200
commit6c575ad8c8aa298a8e8d11612d837c51880d528a (patch)
treea30667860677de4d9dd7e78e45f94ec09d86e574
parent73c410523097a699559ce5ae12b9caf9c50972fc (diff)
downloadpytest-6c575ad8c8aa298a8e8d11612d837c51880d528a.tar.gz
fixtures: simplify FixtureRequest._get_fixturestack()
-rw-r--r--src/_pytest/fixtures.py11
1 files changed, 4 insertions, 7 deletions
diff --git a/src/_pytest/fixtures.py b/src/_pytest/fixtures.py
index 53f33d3e1..aed81029f 100644
--- a/src/_pytest/fixtures.py
+++ b/src/_pytest/fixtures.py
@@ -607,14 +607,11 @@ class FixtureRequest:
def _get_fixturestack(self) -> List["FixtureDef[Any]"]:
current = self
values: List[FixtureDef[Any]] = []
- while 1:
- fixturedef = getattr(current, "_fixturedef", None)
- if fixturedef is None:
- values.reverse()
- return values
- values.append(fixturedef)
- assert isinstance(current, SubRequest)
+ while isinstance(current, SubRequest):
+ values.append(current._fixturedef) # type: ignore[has-type]
current = current._parent_request
+ values.reverse()
+ return values
def _compute_fixture_value(self, fixturedef: "FixtureDef[object]") -> None:
"""Create a SubRequest based on "self" and call the execute method