jiuyuan
/
test_ok1
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use a single node ID rather than a set for failed tests.

This commit is contained in:
Niclas Olofsson 2015-09-26 14:32:11 +02:00 committed by David Szotten
parent 661055105c
commit 1d23bef3fb
1 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
pytest_stepwise/plugin.py
View File

@ -25,7 +25,7 @@ class StepwisePlugin:
self.session = None self.session = None
if self.active: if self.active:
self.lastfailed = config.cache.get('cache/stepwise', set()) self.lastfailed = config.cache.get('cache/stepwise', None)
self.skip = config.getvalue('skip') self.skip = config.getvalue('skip')
def pytest_sessionstart(self, session): def pytest_sessionstart(self, session):
@ -40,7 +40,7 @@ class StepwisePlugin:
# Make a list of all tests that has been runned before the last failing one. # Make a list of all tests that has been runned before the last failing one.
for item in items: for item in items:
if item.nodeid in self.lastfailed: if item.nodeid == self.lastfailed:
found = True found = True
break break
else: else:
@ -69,22 +69,25 @@ class StepwisePlugin:
if self.skip: if self.skip:
# Remove test from the failed ones (if it exists) and unset the skip option # Remove test from the failed ones (if it exists) and unset the skip option
# to make sure the following tests will not be skipped. # to make sure the following tests will not be skipped.
self.lastfailed.discard(report.nodeid) if report.nodeid == self.lastfailed:
self.lastfailed = None
self.skip = False self.skip = False
else: else:
# Mark test as the last failing and interrupt the test session. # Mark test as the last failing and interrupt the test session.
self.lastfailed.add(report.nodeid) self.lastfailed = report.nodeid
self.session.shouldstop = 'Test failed, continuing from this test next run.' self.session.shouldstop = 'Test failed, continuing from this test next run.'
else: else:
# If the test was actually run and did pass. # If the test was actually run and did pass.
if report.when == 'call': if report.when == 'call':
# Remove test from the failed ones, if exists. # Remove test from the failed ones, if exists.
self.lastfailed.discard(report.nodeid) if report.nodeid == self.lastfailed:
self.lastfailed = None
def pytest_sessionfinish(self, session): def pytest_sessionfinish(self, session):
if self.active: if self.active:
self.config.cache.set('cache/stepwise', self.lastfailed) self.config.cache.set('cache/stepwise', self.lastfailed)
else: else:
# Clear the list of failing tests if the plugin is not active. # Clear the list of failing tests if the plugin is not active.
self.config.cache.set('cache/stepwise', set()) self.config.cache.set('cache/stepwise', [])