fix duration option in case of collection errors
This commit is contained in:
parent
ae53d04780
commit
0b18b6094e
|
@ -1,2 +1,2 @@
|
||||||
#
|
#
|
||||||
__version__ = '2.2.0.dev3'
|
__version__ = '2.2.0.dev4'
|
||||||
|
|
|
@ -28,11 +28,10 @@ def pytest_terminal_summary(terminalreporter):
|
||||||
duration2rep = {}
|
duration2rep = {}
|
||||||
alldurations = 0.0
|
alldurations = 0.0
|
||||||
for key, replist in tr.stats.items():
|
for key, replist in tr.stats.items():
|
||||||
if key == "deselected":
|
|
||||||
continue
|
|
||||||
for rep in replist:
|
for rep in replist:
|
||||||
duration2rep[rep.duration] = rep
|
if hasattr(rep, 'duration'):
|
||||||
alldurations += rep.duration
|
duration2rep[rep.duration] = rep
|
||||||
|
alldurations += rep.duration
|
||||||
if not duration2rep:
|
if not duration2rep:
|
||||||
return
|
return
|
||||||
d2 = list(duration2rep.items())
|
d2 = list(duration2rep.items())
|
||||||
|
|
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.dev3',
|
version='2.2.0.dev4',
|
||||||
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'],
|
||||||
|
|
|
@ -523,6 +523,16 @@ class TestDurations:
|
||||||
"*call*test_1*",
|
"*call*test_1*",
|
||||||
])
|
])
|
||||||
|
|
||||||
|
def test_with_failing_collection(self, testdir):
|
||||||
|
testdir.makepyfile(self.source)
|
||||||
|
testdir.makepyfile(test_collecterror="""xyz""")
|
||||||
|
result = testdir.runpytest("--durations=2", "-k test_1")
|
||||||
|
assert result.ret != 0
|
||||||
|
result.stdout.fnmatch_lines([
|
||||||
|
"*durations*",
|
||||||
|
"*call*test_1*",
|
||||||
|
])
|
||||||
|
|
||||||
|
|
||||||
class TestDurationWithFixture:
|
class TestDurationWithFixture:
|
||||||
source = """
|
source = """
|
||||||
|
|
Loading…
Reference in New Issue