remove a hack that isn't needed because runtestprotocol now memorizes pending teardowns and thus dist-testing has "exact" teardowns as well
This commit is contained in:
parent
58e0301f87
commit
a1d41c6811
|
@ -1,2 +1,2 @@
|
||||||
#
|
#
|
||||||
__version__ = '2.2.0.dev9'
|
__version__ = '2.2.0.dev10'
|
||||||
|
|
|
@ -330,6 +330,8 @@ class Item(Node):
|
||||||
""" a basic test invocation item. Note that for a single function
|
""" a basic test invocation item. Note that for a single function
|
||||||
there might be multiple test invocation items.
|
there might be multiple test invocation items.
|
||||||
"""
|
"""
|
||||||
|
nextitem = None
|
||||||
|
|
||||||
def reportinfo(self):
|
def reportinfo(self):
|
||||||
return self.fspath, None, ""
|
return self.fspath, None, ""
|
||||||
|
|
||||||
|
|
|
@ -340,13 +340,7 @@ class SetupState(object):
|
||||||
assert not self._finalizers
|
assert not self._finalizers
|
||||||
|
|
||||||
def teardown_exact(self, item):
|
def teardown_exact(self, item):
|
||||||
try:
|
|
||||||
colitem = item.nextitem
|
colitem = item.nextitem
|
||||||
except AttributeError:
|
|
||||||
# in distributed testing there might be no known nexitem
|
|
||||||
# and in this case we use the parent node to at least call
|
|
||||||
# teardown of the current item
|
|
||||||
colitem = item.parent
|
|
||||||
needed_collectors = colitem and colitem.listchain() or []
|
needed_collectors = colitem and colitem.listchain() or []
|
||||||
self._teardown_towards(needed_collectors)
|
self._teardown_towards(needed_collectors)
|
||||||
|
|
||||||
|
|
2
setup.py
2
setup.py
|
@ -24,7 +24,7 @@ def main():
|
||||||
name='pytest',
|
name='pytest',
|
||||||
description='py.test: simple powerful testing with Python',
|
description='py.test: simple powerful testing with Python',
|
||||||
long_description = long_description,
|
long_description = long_description,
|
||||||
version='2.2.0.dev9',
|
version='2.2.0.dev10',
|
||||||
url='http://pytest.org',
|
url='http://pytest.org',
|
||||||
license='MIT license',
|
license='MIT license',
|
||||||
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
|
platforms=['unix', 'linux', 'osx', 'cygwin', 'win32'],
|
||||||
|
|
Loading…
Reference in New Issue