#14853: remove test that was making too many assumptions about stdin. Patch by Elena...

diff --git a/Lib/test/test_file.py b/Lib/test/test_file.py
index dffa4b56eb6319bd52b12ac3dda2c4032bf07ef7..ac2aafa1ce49454aa4a5f012a8b574e7f3d82ef6 100644 (file)
--- a/Lib/test/test_file.py
+++ b/Lib/test/test_file.py
@@ -154,16 +154,6 @@ class OtherFileTests(unittest.TestCase):
                 f.close()
                 self.fail('%r is an invalid file mode' % mode)
 
-    def testStdin(self):
-        # This causes the interpreter to exit on OSF1 v5.1.
-        if sys.platform != 'osf1V5':
-            self.assertRaises((IOError, ValueError), sys.stdin.seek, -1)
-        else:
-            print((
-                '  Skipping sys.stdin.seek(-1), it may crash the interpreter.'
-                ' Test manually.'), file=sys.__stdout__)
-        self.assertRaises((IOError, ValueError), sys.stdin.truncate)
-
     def testBadModeArgument(self):
         # verify that we get a sensible error message for bad mode argument
         bad_mode = "qwerty"

diff --git a/Misc/ACKS b/Misc/ACKS
index b265036444a3814b4add53ae9cccc0831a66777e..cf553b70e6f55216635e1d4b7acdbee84cb58273 100644 (file)
--- a/Misc/ACKS
+++ b/Misc/ACKS
@@ -744,6 +744,7 @@ Nigel O'Brian
 Kevin O'Connor
 Tim O'Malley
 Zooko O'Whielacronx
+Elena Oat
 Pascal Oberndoerfer
 Jeffrey Ollie
 Adam Olsen