Skip to content

Revert PR 125 due to 1.17.0 breakage #158

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 10, 2017
Merged

Revert PR 125 due to 1.17.0 breakage #158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
fae1e02
Revert "Fix missing blank line."
nicoddemus Jun 10, 2017
8e2fdee
Revert "- Reinforce `test_crashing_item` to match test name instead o…
nicoddemus Jun 10, 2017
95a6246
Revert "Mark test as complete at teardown."
nicoddemus Jun 10, 2017
afe8bad
Add news fragment
nicoddemus Jun 10, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog/157.bugfix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Hot fix release reverting the change introduced by #124, unfortunately it broke a number of test suites so we are reversing this change while we investigate the problem.
28 changes: 3 additions & 25 deletions testing/acceptance_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -454,31 +454,9 @@ def test_noncrash():
pass
""")
result = testdir.runpytest("-n2", p)
result.stdout.fnmatch_lines(
["*crashed*::test_crash*", "*1 failed*1 passed*"])


def test_crashing_item_teardown(testdir):
p = testdir.makepyfile("""
import py
import pytest
import os
import time

@pytest.fixture
def crash_fixture(request):
def kill_me():
py.process.kill(os.getpid())
request.addfinalizer(kill_me)

def test_a(crash_fixture):
pass

def test_b():
pass
""")
result = testdir.runpytest("-n1", p)
result.stdout.fnmatch_lines(["*crashed*::test_a*", "*1 failed*2 passed*"])
result.stdout.fnmatch_lines([
"*crashed*test_crash*", "*1 failed*1 passed*"
])


def test_skipping(testdir):
Expand Down
2 changes: 1 addition & 1 deletion xdist/dsession.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -660,7 +660,7 @@ def slave_testreport(self, node, rep):
If the node indicates it is finished with a test item, remove
the item from the pending list in the scheduler.
"""
if rep.when == "teardown" or (rep.when == "setup" and not rep.passed):
if rep.when == "call" or (rep.when == "setup" and not rep.passed):
self.sched.mark_test_complete(node, rep.item_index, rep.duration)
# self.report_line("testreport %s: %s" %(rep.id, rep.status))
rep.node = node
Expand Down