From 8e2fdeee3ee31564cc4419c10d844ffc9fb31bc3 Mon Sep 17 00:00:00 2001 From: Bruno Oliveira Date: Sat, 10 Jun 2017 01:30:42 -0300 Subject: [PATCH] Revert "- Reinforce `test_crashing_item` to match test name instead of test" This reverts commit 99f667380f125c5675490ae2935981431ab28e94. --- testing/acceptance_test.py | 27 +++------------------------ 1 file changed, 3 insertions(+), 24 deletions(-) diff --git a/testing/acceptance_test.py b/testing/acceptance_test.py index c7bee86..1093661 100644 --- a/testing/acceptance_test.py +++ b/testing/acceptance_test.py @@ -454,30 +454,9 @@ def test_crashing_item(testdir): 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):