_test_pty_eof: use os.read, not array.fromfile

We have abandoned array.fromfile() due to bugs that exist in all known
versions of Python (including Python 2.7 and Python 3.2). See
PipeReaderArrayTestCase, for example.

1 files changed, 2 insertions, 27 deletions

diff --git a/pym/portage/tests/ebuild/test_pty_eof.py b/pym/portage/tests/ebuild/test_pty_eof.py
index 0b0bbdb35..fe218b6fa 100644
--- a/pym/portage/tests/ebuild/test_pty_eof.py
+++ b/pym/portage/tests/ebuild/test_pty_eof.py
@@ -1,14 +1,12 @@
 # Copyright 2009-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-import platform
-
 from portage.tests import TestCase
 from portage.util._pty import _can_test_pty_eof, _test_pty_eof
 
-class PtyEofFdopenBufferedTestCase(TestCase):
+class PtyEofTestCase(TestCase):
 
-	def testPtyEofFdopenBuffered(self):
+	def testPtyEof(self):
 
 		if not _can_test_pty_eof():
 			skip_reason = "unsupported on this platform"
@@ -23,29 +21,6 @@ class PtyEofFdopenBufferedTestCase(TestCase):
 		# The result is only valid if openpty does not raise EnvironmentError.
 		if _can_test_pty_eof():
 			try:
-				self.assertEqual(_test_pty_eof(fdopen_buffered=True), True)
-			except EnvironmentError:
-				pass
-
-class PtyEofFdopenUnBufferedTestCase(TestCase):
-	def testPtyEofFdopenUnBuffered(self):
-		# New development: It appears that array.fromfile() is usable
-		# with python3 as long as fdopen is called with a bufsize
-		# argument of 0.
-
-		if not _can_test_pty_eof():
-			skip_reason = "unsupported on this platform"
-			self.portage_skip = skip_reason
-			self.fail(skip_reason)
-			return
-
-		if platform.python_implementation() == 'PyPy':
-			# https://bugs.pypy.org/issue956
-			self.todo = True
-
-		# The result is only valid if openpty does not raise EnvironmentError.
-		if _can_test_pty_eof():
-			try:
 				self.assertEqual(_test_pty_eof(), True)
 			except EnvironmentError:
 				pass