Revert temporary commit in r79937

2 files changed, 3 insertions, 62 deletions

diff --git a/Lib/test/test_io.py b/Lib/test/test_io.py
index accf0eb..9ffe646 100644
--- a/Lib/test/test_io.py
+++ b/Lib/test/test_io.py
@@ -2394,47 +2394,6 @@ class MiscIOTest(unittest.TestCase):
         # baseline "io" module.
         self._check_abc_inheritance(io)
 
-    # Issue #5380: reading all available bytes from a pipe or a PTY when
-    # the other end has been closed.
-
-    def check_pipe_func(self, pipe_func, buffered):
-        master_fd, slave_fd = pipe_func()
-        # Simulate a subprocess writing some data to the
-        # slave end of the pipe, and then exiting.
-        data = b'TEST DATA'
-        try:
-            os.write(slave_fd, data)
-        finally:
-            os.close(slave_fd)
-        with self.open(master_fd, "rb", buffering=-1 if buffered else 0) as f:
-            # Request more data than available
-            gotdata = f.read(len(data) + 1)
-            self.assertEqual(gotdata, data)
-            # Trying to read again returns an empty string
-            self.assertEqual(b'', f.read())
-            self.assertEqual(b'', f.read(1))
-
-    def test_pipe_read_buffered(self):
-        if not hasattr(os, 'pipe'):
-            self.skipTest("os.pipe not available")
-        self.check_pipe_func(os.pipe, True)
-
-    def test_pipe_read_raw(self):
-        if not hasattr(os, 'pipe'):
-            self.skipTest("os.pipe not available")
-        self.check_pipe_func(os.pipe, False)
-
-    def test_openpty_read_buffered(self):
-        if not hasattr(os, 'openpty'):
-            self.skipTest("os.openpty not available")
-        self.check_pipe_func(os.openpty, True)
-
-    def test_openpty_read_raw(self):
-        if not hasattr(os, 'openpty'):
-            self.skipTest("os.openpty not available")
-        self.check_pipe_func(os.openpty, False)
-
-
 class CMiscIOTest(MiscIOTest):
     io = io
 
diff --git a/Lib/test/test_posix.py b/Lib/test/test_posix.py
index 3caf824..afeb616 100644
--- a/Lib/test/test_posix.py
+++ b/Lib/test/test_posix.py
@@ -280,29 +280,11 @@ class PosixTester(unittest.TestCase):
         if hasattr(posix, 'strerror'):
             self.assertTrue(posix.strerror(0))
 
-    def check_pipe_func(self, pipe_func):
-        master_fd, slave_fd = pipe_func()
-        try:
-            # Simulate a subprocess writing some data to the
-            # slave end of the pipe, and then exiting.
-            data = b'TEST DATA'
-            try:
-                os.write(slave_fd, data)
-            finally:
-                os.close(slave_fd)
-            # Request more data than available
-            gotdata = os.read(master_fd, len(data) + 1)
-            self.assertEqual(gotdata, data)
-        finally:
-            os.close(master_fd)
-
     def test_pipe(self):
         if hasattr(posix, 'pipe'):
-            self.check_pipe_func(posix.pipe)
-
-    def test_openpty(self):
-        if hasattr(posix, 'openpty'):
-            self.check_pipe_func(posix.openpty)
+            reader, writer = posix.pipe()
+            os.close(reader)
+            os.close(writer)
 
     def test_tempnam(self):
         if hasattr(posix, 'tempnam'):