From 820b747e7a14e441bb0e499eff51de65973252d0 Mon Sep 17 00:00:00 2001 From: Daniel Hahler Date: Sun, 27 Oct 2019 19:30:41 +0100 Subject: [PATCH] tests: merge/remove test_dontreadfrominput_buffer_python3 --- testing/test_capture.py | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) diff --git a/testing/test_capture.py b/testing/test_capture.py index eb55093bb..91518c37b 100644 --- a/testing/test_capture.py +++ b/testing/test_capture.py @@ -826,6 +826,7 @@ def test_dontreadfrominput(): from _pytest.capture import DontReadFromInput f = DontReadFromInput() + assert f.buffer is f assert not f.isatty() pytest.raises(IOError, f.read) pytest.raises(IOError, f.readlines) @@ -835,20 +836,6 @@ def test_dontreadfrominput(): f.close() # just for completeness -def test_dontreadfrominput_buffer_python3(): - from _pytest.capture import DontReadFromInput - - f = DontReadFromInput() - fb = f.buffer - assert not fb.isatty() - pytest.raises(IOError, fb.read) - pytest.raises(IOError, fb.readlines) - iter_f = iter(f) - pytest.raises(IOError, next, iter_f) - pytest.raises(ValueError, fb.fileno) - f.close() # just for completeness - - @pytest.fixture def tmpfile(testdir): f = testdir.makepyfile("").open("wb+")