diff options
author | Bruno Oliveira <nicoddemus@gmail.com> | 2019-05-30 12:21:51 -0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-05-30 12:21:51 -0300 |
commit | fbd8ff9502f326192e63e9d21881b45e3b5a9cca (patch) | |
tree | 3b8b35caef391b031ee7bcd0ad499230b72d8392 /testing/test_pdb.py | |
parent | 737a1bf94711997b15f96d4d810a59e3c2050cd1 (diff) | |
parent | 6765aca0d18a2b9a08b6911b18787604fe256705 (diff) | |
download | pytest-fbd8ff9502f326192e63e9d21881b45e3b5a9cca.tar.gz |
Merge master into features (#5339)
Merge master into features
Diffstat (limited to 'testing/test_pdb.py')
-rw-r--r-- | testing/test_pdb.py | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/testing/test_pdb.py b/testing/test_pdb.py index 267b1e528..d31d60469 100644 --- a/testing/test_pdb.py +++ b/testing/test_pdb.py @@ -4,7 +4,6 @@ from __future__ import division from __future__ import print_function import os -import platform import sys import six @@ -153,10 +152,11 @@ class TestPDB(object): @staticmethod def flush(child): - if platform.system() == "Darwin": - return if child.isalive(): + # Read if the test has not (e.g. test_pdb_unittest_skip). + child.read() child.wait() + assert not child.isalive() def test_pdb_unittest_postmortem(self, testdir): p1 = testdir.makepyfile( @@ -796,7 +796,6 @@ class TestPDB(object): rest = child.read().decode("utf8") assert "leave_pdb_hook" in rest assert "1 failed" in rest - child.sendeof() self.flush(child) def test_pdb_custom_cls(self, testdir, custom_pdb_calls): |