floraachy
/
pytest2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename FixtureDef.finalizer to FixtureDef.finalizers

This commit is contained in:
Bruno Oliveira 2017-11-12 11:35:46 -02:00
parent 6d3fe0b826
commit a6f2d2d2c9
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
_pytest/fixtures.py
View File

@ -1,14 +1,15 @@
from __future__ import absolute_import, division, print_function from __future__ import absolute_import, division, print_function
import functools
import inspect import inspect
import sys import sys
import warnings import warnings
from collections import OrderedDict
import functools import attr
import py import py
from py._code.code import FormattedExcinfo from py._code.code import FormattedExcinfo
import attr
import _pytest import _pytest
from _pytest import nodes from _pytest import nodes
from _pytest._code.code import TerminalRepr from _pytest._code.code import TerminalRepr
@ -23,9 +24,6 @@ from _pytest.compat import (
from _pytest.outcomes import fail, TEST_OUTCOME from _pytest.outcomes import fail, TEST_OUTCOME
from collections import OrderedDict
def pytest_sessionstart(session): def pytest_sessionstart(session):
import _pytest.python import _pytest.python
@ -737,17 +735,17 @@ class FixtureDef:
self.argnames = getfuncargnames(func, is_method=unittest) self.argnames = getfuncargnames(func, is_method=unittest)
self.unittest = unittest self.unittest = unittest
self.ids = ids self.ids = ids
self._finalizer = [] self._finalizers = []
def addfinalizer(self, finalizer): def addfinalizer(self, finalizer):
self._finalizer.append(finalizer) self._finalizers.append(finalizer)
def finish(self, request): def finish(self, request):
exceptions = [] exceptions = []
try: try:
while self._finalizer: while self._finalizers:
try: try:
func = self._finalizer.pop() func = self._finalizers.pop()
func() func()
except: # noqa except: # noqa
exceptions.append(sys.exc_info()) exceptions.append(sys.exc_info())
@ -765,7 +763,7 @@ class FixtureDef:
# keep instances alive # keep instances alive
if hasattr(self, "cached_result"): if hasattr(self, "cached_result"):
del self.cached_result del self.cached_result
self._finalizer = [] self._finalizers = []
def execute(self, request): def execute(self, request):
# get required arguments and register our own finish() # get required arguments and register our own finish()